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

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/PerformanceProgressServiceImpl.java

@@ -353,7 +353,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());
@@ -438,6 +437,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)){
@@ -445,12 +445,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);
     }
     //履约进度表----运单部分