Merge branch 'v7.0_small_version_fix_20231120' into test

performance-web/src/main/java/com/clx/performance/component/OrderCancelComponent.java

@@ -31,6 +31,7 @@ import com.msl.common.utils.DateUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
@@ -40,34 +41,45 @@ import java.util.stream.Collectors;
 
 @Component
 @Slf4j
-@AllArgsConstructor
 public class OrderCancelComponent implements InitializingBean {
 
-    private final OrderChildDao orderChildDao;
+    @Autowired
+    private OrderChildDao orderChildDao;
 
-    private final OrderGoodsDao orderGoodsDao;
+    @Autowired
+    private OrderGoodsDao orderGoodsDao;
 
-    private final OrderGoodsTruckBindService orderGoodsTruckBindService;
+    @Autowired
+    private OrderGoodsTruckBindService orderGoodsTruckBindService;
 
-    private final GoodsOrderTruckRecordComponent goodsOrderTruckRecordComponent;
+    @Autowired
+    private GoodsOrderTruckRecordComponent goodsOrderTruckRecordComponent;
 
-    private final OrderFeign orderFeign;
+    @Autowired
+    private OrderFeign orderFeign;
 
-    private final DriverService driverService;
+    @Autowired
+    private DriverService driverService;
 
-    private final BreakContractSettlementOwnerService breakContractSettlementOwnerService;
+    @Autowired
+    private BreakContractSettlementOwnerService breakContractSettlementOwnerService;
 
     public static Map<Integer, String> statusCodeMap = new HashMap<>();
 
-    private final IntegralMqService integralMqService;
+    @Autowired
+    private IntegralMqService integralMqService;
 
-    private final OrderChildLogService orderChildLogService;
+    @Autowired
+    private OrderChildLogService orderChildLogService;
 
-    private final OrderChildPostService orderChildPostService;
+    @Autowired
+    private OrderChildPostService orderChildPostService;
 
-    private final OrderService orderService;
+    @Autowired
+    private OrderService orderService;
 
-    private final OrderGoodsService orderGoodsService;
+    @Autowired
+    private OrderGoodsService orderGoodsService;
 
     public List<String> ownerProcess(OrderCancelParam param) {
         String orderNo = param.getOrderNo();

performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java

@@ -48,6 +48,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -63,46 +64,45 @@ import java.util.stream.Collectors;
  */
 @Service
 @Slf4j
-@AllArgsConstructor
 public class OrderGoodsServiceImpl implements OrderGoodsService {
 
-
+    @Autowired
     private OrderGoodsDao orderGoodsDao;
 
-
+    @Autowired
     private OrderGoodsStruct orderGoodsStruct;
 
-
+    @Autowired
     private OrderFeign orderFeign;
 
-
+    @Autowired
     private OrderGoodsTruckBindDao orderGoodsTruckBindDao;
 
-
+    @Autowired
     private OrderGoodsDriverTruckDao orderGoodsDriverTruckDao;
-
+    @Autowired
     private OrderGoodsLogService orderGoodsLogService;
 
-
+    @Autowired
     private UserClxFeign userClxFeign;
 
-
+    @Autowired
     private OrderChildDao orderChildDao;
-
+    @Autowired
     private GoodsOrderTruckRecordComponent goodsOrderTruckRecordComponent;
 
-
+    @Autowired
     private OrderGoodsStatusLazyComponent orderGoodsStatusLazyComponent;
-
+    @Autowired
     private DriverService driverService;
-
+    @Autowired
     private OrderCancelComponent orderCancelComponent;
-
-    private final IntegralMqService integralMqService;
-
-    private final OrderChildLogService orderChildLogService;
-
-    private final OrderChildPostService orderChildPostService;
+    @Autowired
+    private IntegralMqService integralMqService;
+    @Autowired
+    private OrderChildLogService orderChildLogService;
+    @Autowired
+    private OrderChildPostService orderChildPostService;
 
     @Override
     public OrderGoodsVO getOrderGoodsInfoByOrderGoodsNoForPC(String orderGoodsNo) {