运单common修改KwtWaybillOrderV1Mapper

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtTransportCommonService.java

@@ -127,8 +127,9 @@ public class KwtTransportCommonService {
     @Autowired
     public KwtLogisticsOrderMapper logisticsOrderMapper;
 
+
     @Autowired
-    public KwtWaybillOrderMapper waybillOrderMapper;
+    private KwtWaybillOrderV1Mapper kwtWaybillOrderV1Mapper;
 
     @Resource
     private StreamBridge streamBridge;
@@ -396,7 +397,7 @@ public class KwtTransportCommonService {
                     put("upperlOrderId", logisticsOrder.getId());
                     put("passStatus", Global.NUMERICAL_ONE);
                 }};
-                WaybillCountVo waybillOrderCount = waybillOrderMapper.findWaybillOrderCount(map);
+                WaybillCountVo waybillOrderCount = kwtWaybillOrderV1Mapper.findWaybillOrderCount(map);
                 int count = waybillOrderCount == null ? NumberConstant.ZERO : waybillOrderCount.getTotalComplete();
                 orderDetailVO.setOrderAmount(new BigDecimal(count).multiply(price).subtract(fineValue));
             }
@@ -800,7 +801,8 @@ public class KwtTransportCommonService {
                         put("upperlOrderId", logisticsOrderDTO.getLOrderId());
                         put("passStatus", Global.NUMERICAL_ONE);
                     }};
-                    WaybillCountVo waybillOrderCount = waybillOrderMapper.findWaybillOrderCount(map);
+
+                    WaybillCountVo waybillOrderCount = kwtWaybillOrderV1Mapper.findWaybillOrderCount(map);
                     BigDecimal totalComplete = waybillOrderCount == null ? NumberConstant.ZERO_TWO : new BigDecimal(waybillOrderCount.getTotalComplete());
                     actualAmount = totalComplete.multiply(price);
                 } else if (DictEnum.CHARGING_TYPE_4.getValue().equals(billingMode)) {
@@ -1410,7 +1412,7 @@ public class KwtTransportCommonService {
             }
 
             //车辆运单统计(运输中的物流订单+车辆运单审核通过)
-            WaybillCountVo waybillCount = waybillOrderMapper.findWaybillOrderCount(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
+            WaybillCountVo waybillCount = kwtWaybillOrderV1Mapper.findWaybillOrderCount(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                 //put("ownOrderId", order.getId());
                 put("upperlOrderId", order.getId());
                 put("passStatus", Global.NUMERICAL_ONE);