diff --git a/ms-biz/src/main/java/com/ms/api/spi/order/RsyncDdOrdersAndPurchaseOrdersService.java b/ms-biz/src/main/java/com/ms/api/spi/order/RsyncDdOrdersAndPurchaseOrdersService.java index 1eb84db8..b32605cf 100644 --- a/ms-biz/src/main/java/com/ms/api/spi/order/RsyncDdOrdersAndPurchaseOrdersService.java +++ b/ms-biz/src/main/java/com/ms/api/spi/order/RsyncDdOrdersAndPurchaseOrdersService.java @@ -46,6 +46,8 @@ public class RsyncDdOrdersAndPurchaseOrdersService extends SPIBaseService implem public BaseResponse handle(BaseRequest req) { initHandle(req); + Map retMap = new HashMap(); + try { String orderIdsStr = req.getData().getOrderIds(); String sourceOrderIdsStr = req.getData().getSourceOrderIds(); @@ -82,8 +84,10 @@ public class RsyncDdOrdersAndPurchaseOrdersService extends SPIBaseService implem if (!StringUtils.isEmpty(orderIdsStr)) { RsyncOpOrderByOrderIdsResultDTO reynsRet = opOrderService.rsyncOpOrderByOrderIds(shopId, orderIds); if (reynsRet.getOrderIdAndFailReasonMap().size() > 0) { - String reason = String.join(";", reynsRet.getOrderIdAndFailReasonMap().values()); - return R.ok(Ret.fail(reason)); +// String reason = String.join(";", reynsRet.getOrderIdAndFailReasonMap().values()); +// return R.ok(Ret.fail(reason)); + retMap.put("orderIdAndErrorMap", reynsRet.getOrderIdAndFailReasonMap()); + return R.ok(Ret.success(retMap)); } } @@ -124,8 +128,7 @@ public class RsyncDdOrdersAndPurchaseOrdersService extends SPIBaseService implem } } - Map retMap = new HashMap(); - retMap.put("rsyncPurchaseOrderInfo", purchaseOrderListMap); + retMap.put("orderIdAndPurchaseOrderListMap", purchaseOrderListMap); return R.ok(Ret.success(retMap)); } catch (Exception e) { log.error("同步分销采购单失败,原因:" + e.getMessage());