From d5bc3d1936ac66dd03383fb5c9bc6190f73f400a Mon Sep 17 00:00:00 2001
From: daixiaogang <2510234660@qq.com>
Date: Sat, 9 Sep 2023 14:00:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9D=E8=B5=96=E6=B3=A8=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/OutstorageServiceImpl.java   | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/ms-biz/src/main/java/com/ms/api/service/impl/OutstorageServiceImpl.java b/ms-biz/src/main/java/com/ms/api/service/impl/OutstorageServiceImpl.java
index 1e23ef5d..4cfb4e6f 100644
--- a/ms-biz/src/main/java/com/ms/api/service/impl/OutstorageServiceImpl.java
+++ b/ms-biz/src/main/java/com/ms/api/service/impl/OutstorageServiceImpl.java
@@ -13,6 +13,7 @@ import com.ms.dal.entity.OpOrder;
 import com.ms.dal.entity.Shop;
 import com.ms.dal.mapper.OpOrderMapper;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
@@ -22,8 +23,10 @@ import java.util.stream.Collectors;
 
 @Service
 public class OutstorageServiceImpl implements OutstorageService {
-//    @Autowired
-//    private OpOrderService opOrderService;
+
+    @Lazy
+    @Autowired
+    private OpOrderService opOrderService;
 
     @Autowired
     private ShopService shopService;
@@ -40,11 +43,10 @@ public class OutstorageServiceImpl implements OutstorageService {
             throw new RuntimeException("参数错误");
         }
 
-//        OpOrder order = opOrderService.selectByOrderId(orderId);
-//        Shop shop = shopService.getDetailById(order.getShopId());
+        OpOrder order = opOrderService.selectByOrderId(orderId);
+        Shop shop = shopService.getDetailById(order.getShopId());
 
-//        return orderMultiPackageOutstorage(shop.getShopId(), orderId, packageList, shop.getAccessToken(), LogisticsConst.outstorageSourcePurchaseManualSend);
-        return null;
+        return orderMultiPackageOutstorage(shop.getShopId(), orderId, packageList, shop.getAccessToken(), LogisticsConst.outstorageSourcePurchaseManualSend);
     }
 
     @Override
@@ -63,12 +65,11 @@ public class OutstorageServiceImpl implements OutstorageService {
             packageInfoDTO.setCompany(opLogisticsBO.getLogisticsName());
         }
 
-//        OrderLogisticsAddMultiPackData packData = opOrderService.orderLogisticsAddMultiPackToDd(orderId, packageList, accessToken);
-//        // 保存操作数据，暂时不做
-////        saveOrderMultiPackageOutstorageResult(shopId, orderId, packageList, packData, outStorageSource);
+        OrderLogisticsAddMultiPackData packData = opOrderService.orderLogisticsAddMultiPackToDd(orderId, packageList, accessToken);
+        // 保存操作数据，暂时不做
+//        saveOrderMultiPackageOutstorageResult(shopId, orderId, packageList, packData, outStorageSource);
 
-//        return packData;
-        return null;
+        return packData;
     }
 
     private void saveOrderMultiPackageOutstorageResult() {