Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java

ms-biz/src/main/java/com/ms/api/spi/order/RsyncDdOrdersAndPurchaseOrdersService.java

@@ -87,7 +87,7 @@ public class RsyncDdOrdersAndPurchaseOrdersService extends SPIBaseService implem
                 }
             }
 
-            Map<String, List<RsyncDdOrdersAndPurchaseOrderDTO>> retMap = new HashMap();
+            Map<String, List<RsyncDdOrdersAndPurchaseOrderDTO>> purchaseOrderListMap = new HashMap();
             if (!StringUtils.isEmpty(orderIdsStr)) {
                 List<String> shopIds = new ArrayList<>();
                 shopIds.add(shopId.toString());
@@ -113,17 +113,19 @@ public class RsyncDdOrdersAndPurchaseOrdersService extends SPIBaseService implem
                             }
                         }
                         retOrder.setItems(itemList);
-                        if (retMap.containsKey(orderId)) {
-                            retMap.get(orderId).add(retOrder);
+                        if (purchaseOrderListMap.containsKey(orderId)) {
+                            purchaseOrderListMap.get(orderId).add(retOrder);
                         } else {
                             List<RsyncDdOrdersAndPurchaseOrderDTO> newList = new ArrayList<>();
                             newList.add(retOrder);
-                            retMap.put(orderId, newList);
+                            purchaseOrderListMap.put(orderId, newList);
                         }
                     }
                 }
             }
 
+            Map retMap = new HashMap();
+            retMap.put("rsyncPurchaseOrderInfo", purchaseOrderListMap);
             return R.ok(Ret.success(retMap));
         } catch (Exception e) {
             log.error("同步分销采购单失败，原因：" + e.getMessage());