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

performance-web/src/main/java/com/clx/performance/mapper/OrderChildMapper.java

@@ -186,6 +186,6 @@ public interface OrderChildMapper extends BaseMapper<OrderChild> {
 
 
 
-    @SelectProvider(type = OrderChildSqlProvider.class, method = "batchUpdateCancel")
-    void batchUpdateCancel(@Param("canCancelOrderChildList") List<OrderChild> canCancelOrderChildList);
+    @UpdateProvider(type = OrderChildSqlProvider.class, method = "batchUpdateCancel")
+    void batchUpdateCancel(List<OrderChild> canCancelOrderChildList);
 }
\ No newline at end of file

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

@@ -178,7 +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(residueWeight) > 0 ? BigDecimal.ZERO : residueWeight);
+        orderGoodsVO.setResidueTransportWeight(residueWeight);
 
         //获取订单配置的违约金方案
         OwnerQuotationDetailVO quotationDetailVO = quotationService.getQuotationByOrderNo(orderNo).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
@@ -781,7 +781,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
                 PerformanceResultEnum.DATA_NOT_FIND);
 
         //订单剩余吨数
-        BigDecimal orderResidueWeight = orderWeightService.getOrderResidueWeight(goodsCancelParam.getOrderNo());
+        BigDecimal orderResidueWeight = orderWeightService.getOrderResidueWeight(orderGoods.getOrderNo());
 
         //获取货单剩余吨数
         BigDecimal orderGoodsResidueWeight = this.calcOrderGoodsResidueWeight(orderGoods.getExtractWeight(),orderGoods.getAlreadyTransportWeight());
@@ -1034,12 +1034,8 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
 
     @Override
     public BigDecimal calcOrderGoodsResidueWeight(BigDecimal extractWeight, BigDecimal alreadyWeight) {
-        BigDecimal residueTransportWeight = Objects.nonNull(extractWeight)?extractWeight:BigDecimal.ZERO
-                .subtract(Objects.nonNull(alreadyWeight)?alreadyWeight:BigDecimal.ZERO);
-
-        if(residueTransportWeight.compareTo(BigDecimal.ZERO) <= 0){
-            return BigDecimal.ZERO;
-        }
-        return residueTransportWeight;
+        BigDecimal weight1 = Objects.nonNull(extractWeight)?extractWeight:BigDecimal.ZERO;
+        BigDecimal weight2 = Objects.nonNull(alreadyWeight)?alreadyWeight:BigDecimal.ZERO;
+        return weight1.subtract(weight2);
     }
 }

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

@@ -4,10 +4,7 @@ import com.clx.order.enums.VehicleUsageEnum;
 import com.clx.order.vo.feign.FeignOrderInfoVO;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderGoodsDao;
-import com.clx.performance.enums.OrderGoodsStatusEnum;
-import com.clx.performance.enums.PerformanceResultEnum;
-import com.clx.performance.enums.ResultEnum;
-import com.clx.performance.enums.TruckDemandEnum;
+import com.clx.performance.enums.*;
 import com.clx.performance.extranal.user.OrderService;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
@@ -147,6 +144,9 @@ public class OrderWeightServiceImpl implements OrderWeightService {
         BigDecimal alreadyWeight = BigDecimal.ZERO;    //该订单下已经拉运的重量
 
         for (OrderChild child : orderChildList) {
+            if(child.getStatus() > OrderChildEnum.Status.COMPLETE.getCode()){
+                continue;
+            }
             if(Objects.nonNull(child.getLoadNet())){
                 alreadyWeight = alreadyWeight.add(child.getLoadNet());
             }else{

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

@@ -271,7 +271,7 @@ public class OrderChildSqlProvider {
             StringJoiner sj = new StringJoiner(",","order_goods_no in (",")");
             orderGoodsList.forEach(item -> sj.add("'"+item+"'"));
             WHERE(sj.toString());
-            WHERE(" a.status < " + OrderChildEnum.Status.DRIVER_CANCEL.getCode());
+            WHERE("  status < " + OrderChildEnum.Status.DRIVER_CANCEL.getCode());
             GROUP_BY(" order_goods_no");
         }}.toString();
     }