Merge remote-tracking branch 'origin/v20.8_add_sub_weight_20240805' into dev

performance-api/src/main/java/com/clx/performance/vo/feign/OrderExtractWeightVO.java

@@ -26,6 +26,11 @@ public class OrderExtractWeightVO {
     @ApiModelProperty(value = "拉运吨数")
     private BigDecimal transportWeight;
 
+
+    @ApiModelProperty("可提取吨数")
+    private BigDecimal canExtractWeight;
+
+
     @ApiModelProperty("平台承运吨数")
     private BigDecimal platformCarryWeight;
 

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

@@ -17,6 +17,7 @@ import com.clx.performance.service.OrderChildLogService;
 import com.clx.performance.service.OrderGoodsService;
 import com.clx.performance.service.breakcontract.BreakContractDriverRecordService;
 import com.clx.performance.service.child.OrderChildPostService;
+import com.clx.performance.utils.spring.ApplicationContextUtils;
 import com.clx.user.enums.driver.DriverInfoEnum;
 import com.msl.common.base.Optional;
 import com.msl.common.utils.DateUtils;
@@ -64,7 +65,6 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
 
     private final OrderChildPostService orderChildPostService;
 
-    private final OrderGoodsService orderGoodsService;
 
 
     //根据货单最晚接单时间处理
@@ -123,8 +123,8 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
                     continue;
                 }
                 OrderGoods orderGoods = optional.get();
-                BigDecimal residueTransportWeight = orderGoodsService.calcOrderGoodsResidueWeight
-                        (orderGoods.getExtractWeight(),orderGoods.getAlreadyTransportWeight());
+                BigDecimal residueTransportWeight = ApplicationContextUtils.getBean(OrderGoodsService.class).
+                        calcOrderGoodsResidueWeight(orderGoods.getExtractWeight(),orderGoods.getAlreadyTransportWeight());;
 
                 if (residueTransportWeight.compareTo(BigDecimal.ZERO) == 0) {
                     List<OrderChild> orderChildren = orderChildDao.selectInTransitOrderChildByOrderGoodsNo(orderGoodsNo);

performance-web/src/main/java/com/clx/performance/listener/OrderGoodsDtsListener.java

@@ -105,6 +105,8 @@ public class OrderGoodsDtsListener {
             ||     //挂单中之后的状态的挂单运费发生变化
                 (after.getOrderGoodsStatus() >= OrderGoodsStatusEnum.Status.PAYING.getCode() &&
                  !Objects.equals(before.getPendingOrderFreight(),after.getPendingOrderFreight()))
+                  //提取吨数发生变化
+            ||  (after.getExtractWeight().compareTo(BigDecimal.ZERO) != 0)
             )
         ){
             isSend = true;

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

@@ -168,6 +168,8 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
     @Override
     public OrderGoodsVO getOrderGoodsInfoByOrderGoodsNoForAPP(String orderGoodsNo) {
         OrderGoodsVO orderGoodsVO = orderGoodsDao.getOrderGoodsInfoByOrderGoodsNoForAPP(orderGoodsNo).map(orderGoodsStruct::convert).get();
+        BigDecimal residueWeight = this.calcOrderGoodsResidueWeight(orderGoodsVO.getExtractWeight(),
+                orderGoodsVO.getAlreadyTransportWeight());
         String orderNo = orderGoodsVO.getOrderNo();
         FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(orderNo);
         orderGoodsVO.setReveiveAddressAll(orderInfoFeign.getReveiveAddressAll());
@@ -176,13 +178,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
         orderGoodsVO.setUnloadEndTime(orderInfoFeign.getUnloadEndTime());
         orderGoodsVO.setLoadBeginTime(orderInfoFeign.getLoadBeginTime());
         orderGoodsVO.setLoadEndTime(orderInfoFeign.getLoadEndTime());
-        orderGoodsVO.setResidueTransportWeight(BigDecimal.ZERO.compareTo(orderGoodsVO.getResidueTransportWeight()) > 0 ? BigDecimal.ZERO : orderGoodsVO.getResidueTransportWeight());
-        //货源地信息
-        orderGoodsVO.setSendContact(orderInfoFeign.getSendContact());
-        orderGoodsVO.setSendContactPhone(orderInfoFeign.getSendContactPhone());
-        orderGoodsVO.setSendWaitSystem(orderInfoFeign.getSendWaitSystem());
-        orderGoodsVO.setSendWaitSystemName(orderInfoFeign.getSendWaitSystemName());
-        orderGoodsVO.setSendWaitMode(orderInfoFeign.getSendWaitMode());
+        orderGoodsVO.setResidueTransportWeight(BigDecimal.ZERO.compareTo(residueWeight) > 0 ? BigDecimal.ZERO : residueWeight);
 
         //获取订单配置的违约金方案
         OwnerQuotationDetailVO quotationDetailVO = quotationService.getQuotationByOrderNo(orderNo).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
@@ -241,9 +237,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
                         item.setOverOrderWeight(1);
                     }
                 }
-                item.setResidueTransportWeight(item.getExtractWeight()
-                        .subtract(Objects.nonNull(item.getAlreadyTransportWeight())
-                                ?item.getAlreadyTransportWeight():BigDecimal.ZERO));
+                item.setResidueTransportWeight(calcOrderGoodsResidueWeight(item.getExtractWeight(),item.getAlreadyTransportWeight()));
             });
         }
         return page;
@@ -410,6 +404,11 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
     @Override
     public List<OrderGoodsFeignVO> getOrderGoodsListByOrderNo(String orderNo) {
         List<OrderGoods> list = orderGoodsDao.getOrderGoodsListByOrderNo(orderNo);
+
+        if(CollectionUtils.isNotEmpty(list)){
+            list.forEach(item-> item.setResidueTransportWeight(this.calcOrderGoodsResidueWeight(item.getExtractWeight(),
+                    item.getAlreadyTransportWeight())));
+        }
         return orderGoodsStruct.convertList(list);
     }
 
@@ -824,9 +823,9 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
     public OrderGoodsEditVO findOrderGoodsById(Integer id) {
         OrderGoodsEditVO result = new OrderGoodsEditVO();
         OrderGoodsVO orderGoodsVO = orderGoodsDao.findOrderGoodsById(id);
-        orderGoodsVO.setResidueTransportWeight(orderGoodsVO.getExtractWeight()
-                .subtract(Objects.nonNull(orderGoodsVO.getAlreadyTransportWeight())
-                        ?orderGoodsVO.getAlreadyTransportWeight():BigDecimal.ZERO));
+        orderGoodsVO.setResidueTransportWeight(
+                this.calcOrderGoodsResidueWeight(orderGoodsVO.getExtractWeight(),orderGoodsVO.getAlreadyTransportWeight())
+        );
 
         String orderNo = orderGoodsVO.getOrderNo();
         FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(orderNo);

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

@@ -47,10 +47,17 @@ public class OrderWeightServiceImpl implements OrderWeightService {
 
         List<OrderGoods> orderGoodsList = orderGoodsDao.listByField(OrderGoods::getOrderNo, orderNo);
         if(CollectionUtils.isEmpty(orderGoodsList)){
+            BigDecimal canExtractWeight = Objects.nonNull(orderInfo.getPlatformCarryWeight())?
+                    orderInfo.getPlatformCarryWeight():BigDecimal.ZERO.add(
+                            Objects.nonNull(orderInfo.getOwnCarryWeight())?
+                    orderInfo.getOwnCarryWeight():BigDecimal.ZERO);
             return  OrderExtractWeightVO.builder().transportWeight(orderInfo.getTransportWeight())
                     .truckDemand(orderInfo.getTruckDemand())
-                    .ownCarryWeight(orderInfo.getOwnCarryWeight()).platformCarryWeight(orderInfo.getPlatformCarryWeight())
-                    .ownCanExtractWeight(orderInfo.getOwnCarryWeight()).platCanExtractWeight(orderInfo.getPlatformCarryWeight())
+                    .ownCarryWeight(orderInfo.getOwnCarryWeight())
+                    .platformCarryWeight(orderInfo.getPlatformCarryWeight())
+                    .ownCanExtractWeight(orderInfo.getOwnCarryWeight())
+                    .platCanExtractWeight(orderInfo.getPlatformCarryWeight())
+                    .canExtractWeight(canExtractWeight)
                     .build();
         }
         //已发布的自有车辆吨数
@@ -82,6 +89,9 @@ public class OrderWeightServiceImpl implements OrderWeightService {
                     .truckDemand(orderInfo.getTruckDemand())
                     .platformCarryWeight(orderInfo.getPlatformCarryWeight())
                     .platCanExtractWeight(orderInfo.getTransportWeight().subtract(platOrderGoodsWeight))
+                    .ownCarryWeight(BigDecimal.ZERO)
+                    .ownCanExtractWeight(BigDecimal.ZERO)
+                    .canExtractWeight(orderInfo.getTransportWeight().subtract(platOrderGoodsWeight))
                     .build();
         }
         if(Objects.equals(orderInfo.getTruckDemand(), TruckDemandEnum.TruckType.OWNER_CAR.getCode())){
@@ -89,6 +99,9 @@ public class OrderWeightServiceImpl implements OrderWeightService {
                     .truckDemand(orderInfo.getTruckDemand())
                     .ownCarryWeight(orderInfo.getOwnCarryWeight())
                     .ownCanExtractWeight(orderInfo.getTransportWeight().subtract(ownOrderGoodsWeight))
+                    .platformCarryWeight(BigDecimal.ZERO)
+                    .platCanExtractWeight(BigDecimal.ZERO)
+                    .canExtractWeight(orderInfo.getTransportWeight().subtract(ownOrderGoodsWeight))
                     .build();
         }
         if(Objects.equals(orderInfo.getTruckDemand(), TruckDemandEnum.TruckType.PLATFORM_ANY_CAR.getCode())){
@@ -113,6 +126,7 @@ public class OrderWeightServiceImpl implements OrderWeightService {
                     .platformCarryWeight(orderInfo.getPlatformCarryWeight())
                     .ownCanExtractWeight(ownCanExtractWeight)
                     .platCanExtractWeight(platCanExtractWeight)
+                    .canExtractWeight(platCanExtractWeight.add(ownCanExtractWeight))
                     .build();
         }else{
             log.warn("订单号：{} 的用车需求未知",orderNo);

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

@@ -354,7 +354,6 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
         item.setGoodsName(data.getGoodsName());
         item.setSendOverStandard(data.getOverWeight());
         item.setTaskWeight(data.getTransportWeight());
-        item.setPendingWeight(data.getTransportWeight().subtract(data.getResidueWeight()));
 
         item.setTransportTimeSlot(DateUtils.formatDateTime(data.getTransportBeginTime()).get() + "至" +
                 DateUtils.formatDateTime(data.getTransportEndTime()).get());
@@ -439,6 +438,7 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
         Set<String> seniorLogisticsManagerNameSet = new HashSet<>();
         BigDecimal pendingOrderFreight =  null;  //最新的货单的司机运费，取消的也算
         LocalDateTime firstPendingTime = null;  //挂单时间，取消的也算
+        BigDecimal pendingWeight = BigDecimal.ZERO;
         for(OrderGoods item : orderGoods){
             seniorLogisticsManagerNameSet.add(item.getSeniorLogisticsManagerName());
             if(Objects.isNull(pendingOrderFreight)){
@@ -446,12 +446,15 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
             }
             //最后一个挂单中的货单的挂单时间为最早的挂单时间
             firstPendingTime = item.getPendingOrderTime();
+
+            pendingWeight = pendingWeight.add(item.getExtractWeight());
         }
         PerformanceProgress update = new PerformanceProgress();
         update.setId(optional.get().getId());
         update.setSeniorLogisticsManagerName(JSON.toJSONString(new ArrayList<>(seniorLogisticsManagerNameSet)));
         update.setDriverFreightPrice(pendingOrderFreight);
         update.setPendingTime(firstPendingTime);
+        update.setPendingWeight(pendingWeight);
         performanceProgressDao.updateEntityByKey(update);
     }
     //履约进度表----运单部分

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderGoodsSqlProvider.java

@@ -404,7 +404,7 @@ public class OrderGoodsSqlProvider {
 
     public String calcOrderGoodsExtractWeightByOrderNoList(List<String> orderNoList){
         String sql = new SQL() {{
-            SELECT("order_no,sum(extract_weight)");
+            SELECT("order_no,sum(extract_weight) extractWeight");
             FROM("order_goods");
 
             StringJoiner sj = new StringJoiner(",","order_no in (",")");