依赖注入

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() {