Merge remote-tracking branch 'origin/v28.8_carrier_exercise_optimization_20241010' into test_jdk17

clx-performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java

@@ -223,4 +223,6 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
     int countLoadByOrderGoodsNo(String orderGoodsNo);
 
     Long countNotCancelOrderChild(List<String> cancelOrderGoodsNo);
+
+    Long queryNoCancelChildByOrderGoodsNo(String orderGoodsNo, Integer code);
 }

clx-performance-web/src/main/java/com/clx/performance/dao/OrderGoodsDao.java

@@ -115,4 +115,5 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
 
     void batchCancelOrderGoodsWeight(List<OrderGoodsCancelWeightDTO> cancelOrderGoodsList);
 
+    boolean updateExtractWeightAndNeedTruckNum(String orderGoodsNo, BigDecimal extractWeight, Integer needTruckNum);
 }

clx-performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java

@@ -734,4 +734,11 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         queryWrapper.le(OrderChild :: getStatus,OrderChildEnum.Status.COMPLETE.getCode());
         return baseMapper.selectCount(queryWrapper);
     }
+
+    @Override
+    public Long queryNoCancelChildByOrderGoodsNo(String orderGoodsNo, Integer status) {
+        return baseMapper.selectCount(lQrWrapper().eq(OrderChild::getOrderGoodsNo,orderGoodsNo)
+                .lt(ObjectUtil.isNotEmpty(status),OrderChild::getStatus, status)
+        );
+    }
 }

clx-performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsDaoImpl.java

@@ -314,4 +314,14 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
     public void batchCancelOrderGoodsWeight(List<OrderGoodsCancelWeightDTO> cancelOrderGoodsList) {
         baseMapper.batchCancelOrderGoodsWeight(cancelOrderGoodsList);
     }
+
+    @Override
+    public boolean updateExtractWeightAndNeedTruckNum(String orderGoodsNo, BigDecimal extractWeight,
+            Integer needTruckNum) {
+        return update(lUdWrapper()
+                .in(OrderGoods::getOrderGoodsNo, orderGoodsNo)
+                .set(OrderGoods::getExtractWeight, extractWeight)
+                .set(OrderGoods :: getNeedTruckNum,needTruckNum)
+        );
+    }
 }

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

@@ -39,7 +39,6 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
 
     @Update(" update order_goods set " +
             " already_transport_weight = already_transport_weight - #{residueWeight}," +
-            " extract_weight = already_transport_weight," +
             "order_goods_status = #{orderGoodsStatus} " +
             " where id = #{id}")
     void updateOrderGoodsWeightAlreadyAndStatus(@Param("id") Integer id, @Param("residueWeight") BigDecimal residueWeight, @Param("orderGoodsStatus") Integer orderGoodsStatus);

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

@@ -727,9 +727,14 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
         OrderGoods orderGoods = dto.getOrderGoods();
         List<String> childNoList = dto.getChildNoList();
 
+        //查询该货单下未取消的运单数量
+        Long noCancelChildCount = orderChildDao.queryNoCancelChildByOrderGoodsNo(orderGoods.getOrderGoodsNo(),
+                OrderChildEnum.Status.DRIVER_CANCEL.getCode());
+
+
         List<OrderChild> orderChildList = orderChildDao.selectResidueWeightByOrderGoodsNo(orderGoods.getOrderGoodsNo(),
                 OrderChildEnum.Status.DRIVER_CANCEL.getCode(), dto.getOrderGoodsCancelParam().getTruckList());
-
+        Long needTruckNum = 0L;
         if (CollectionUtils.isNotEmpty(orderChildList)) {
             List<OrderChild> filterOrderChildList = orderChildList.stream().
                     filter(item -> item.getStatus() < OrderChildEnum.Status.LOAD.getCode()).collect(Collectors.toList());
@@ -748,16 +753,32 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
                     OrderChildEnum.Status.PLATFORM_CANCEL.getCode(),"系统取消",
                     now, now, childNoList);
             orderChildList.removeAll(filterOrderChildList);
-            if (CollectionUtil.isNotEmpty(orderChildList)) {
+            //此次不能取消的运单不为空   || 货单下的未取消的运单数 大于 已经取消的运单数
+            if (CollectionUtil.isNotEmpty(orderChildList) || noCancelChildCount > filterOrderChildList.size()) {
                 dto.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.COMPLETED.getCode());
             }
+            needTruckNum = noCancelChildCount-filterOrderChildList.size();
         }
         orderGoodsTruckBindDao.updateOrderGoodsBindStatus(orderGoods.getOrderGoodsNo(), OrderGoodsTruckBindEnum.Status.CANCEL.getCode());
 
         orderGoodsDao.updateOrderGoodsSetAlreadyWeightAndStatus(sum, dto.getOrderGoodsStatus(), orderGoods.getId());
 
+        if(Objects.equals(dto.getOrderGoodsStatus(),OrderGoodsStatusEnum.Status.COMPLETED.getCode())){
+            updateCompleteNeedTruck(orderGoods.getOrderGoodsNo(),
+                    orderGoods.getAlreadyTransportWeight().subtract(sum),needTruckNum.intValue());
+        }
+
     }
 
+    //更新取消变成完结的货单的需要车辆数和提取量
+    public void updateCompleteNeedTruck(String orderGoodsNo,BigDecimal extractWeight,Integer needTruckNum){
+        log.info("更新货单的需要车辆数和提取量，货单号:{},提取吨数：{}，需要车数:{}",orderGoodsNo,extractWeight,needTruckNum);
+        boolean flag = orderGoodsDao.updateExtractWeightAndNeedTruckNum(orderGoodsNo,extractWeight,needTruckNum);
+        log.info("更新货单的需要车辆数和提取量，货单号:{},更新结果:{}",orderGoodsNo,flag);
+
+    }
+
+
     private void cancelOperateTwoTypeStrategy(OrderGoodsCancelDTO dto) {
         String now = DateUtils.formatDateTime(LocalDateTime.now()).get();
         OrderGoods orderGoods = dto.getOrderGoods();
@@ -766,6 +787,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
 
         BigDecimal childResidueWeight = BigDecimal.ZERO;
 
+        int needTruckNum = 0;
         if (CollectionUtils.isNotEmpty(orderChildList)) {
             List<OrderChild> filterOrderChildList = orderChildList.stream().filter(item -> item.getStatus() < OrderChildEnum.Status.ARRIVE_SEND.getCode()).collect(Collectors.toList());
             if (CollectionUtils.isNotEmpty(filterOrderChildList)) {
@@ -785,11 +807,16 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
             }
             orderChildList.removeAll(filterOrderChildList);
             if (CollectionUtil.isNotEmpty(orderChildList)) {
+                needTruckNum = orderChildList.size();
                 dto.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.COMPLETED.getCode());
             }
         }
         orderGoodsTruckBindDao.updateOrderGoodsBindStatus(orderGoods.getOrderGoodsNo(), OrderGoodsTruckBindEnum.Status.CANCEL.getCode());
-        orderGoodsDao.updateOrderGoodsWeightAlreadyAndStatus(orderGoods.getId(),childResidueWeight,OrderGoodsStatusEnum.Status.COMPLETED.getCode());
+        orderGoodsDao.updateOrderGoodsWeightAlreadyAndStatus(orderGoods.getId(),childResidueWeight,dto.getOrderGoodsStatus());
+        if(Objects.equals(dto.getOrderGoodsStatus(),OrderGoodsStatusEnum.Status.COMPLETED.getCode())){
+            updateCompleteNeedTruck(orderGoods.getOrderGoodsNo(),
+                    orderGoods.getAlreadyTransportWeight().subtract(childResidueWeight),needTruckNum);
+        }
     }
 
     private void cancelOperateOneTypeStrategy(OrderGoodsCancelDTO dto) {