Merge branch 'v17.3_youhua_20240615' into dev

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

@@ -2648,12 +2648,17 @@ public class OrderChildServiceImpl implements OrderChildService {
         List<String> childNos;//取消运单
         //未到达货源地之前运单（不包括取消）
         List<OrderChild> arriveBeforeOrderChild = orderChildDao.listByOrderNo(param.getOrderNo(),arriveBeforeStatus);
+        log.info("arriveBeforeOrderChild：{}",arriveBeforeOrderChild);
         if(orderedWeight.compareTo(availableWeight) > 0){//已挂吨数大于可拉运吨数  取消未到达货源地的运单
+            log.info("已挂吨数大于可拉运吨数,取消未到达货源地的运单：{}",orderedWeight.compareTo(availableWeight));
             //到达货源地之后运单（不包括取消）
             List<OrderChild> arriveAfterOrderChild = orderChildDao.listByOrderNo(param.getOrderNo(),arriveAfterStatus);
+            log.info("arriveAfterOrderChild：{}",arriveAfterOrderChild);
             BigDecimal arriveAfterWeight = arriveAfterOrderChild.stream().map(OrderChild::getWeight)
                     .reduce(BigDecimal::add).orElse(BigDecimal.ZERO);//总拉运吨数
+            log.info("总拉运吨数：{}",arriveAfterWeight);
             if(availableWeight.compareTo(arriveAfterWeight) >0){//可拉运吨数大于运单拉运吨数  取消未到达货源地的运单
+                log.info("可拉运吨数大于运单拉运吨数,取消未到达货源地的运单：{}",availableWeight.compareTo(arriveAfterWeight));
                 BigDecimal weight =BigDecimal.ZERO;//运单累加吨数
                 BigDecimal subtract = availableWeight.subtract(arriveAfterWeight);//可拉运吨数-运单拉运吨数=司机可以接单拉运吨数
                 List<String> notCancelChildNos = new ArrayList<>();//不需要取消的运单
@@ -2664,12 +2669,14 @@ public class OrderChildServiceImpl implements OrderChildService {
                     }
                     notCancelChildNos.add(oc.getChildNo());//获取可以取消的运单
                 }
+                log.info("notCancelChildNos：{}",notCancelChildNos);
                 childNos = arriveBeforeOrderChild.stream().map(OrderChild::getChildNo).collect(Collectors.toList());//未到达货源地
                 childNos.removeAll(notCancelChildNos);//剔除不需要取消的运单
 
             }else{
                 childNos = arriveBeforeOrderChild.stream().map(OrderChild::getChildNo).collect(Collectors.toList());//未到达货源地
             }
+            log.info("批量取消运单：childNos：{}",childNos);
 
             //批量取消运单
             if(CollectionUtils.isNotEmpty(childNos)){

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

@@ -1007,11 +1007,14 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void cancelOrderGoods(CancelOrderGoodsParam param) {
+
+        log.info("取消货单：{}",param);
         //取消货单
         orderGoodsDao.cancelOrderGoods(param.getOrderNo());
 
         //批量保存货单日志
         List<OrderGoods> orderGoodsListByOrderNo = orderGoodsDao.getOrderGoodsListByOrderNo(param.getOrderNo());
+        log.info("orderGoodsListByOrderNo：{}",orderGoodsListByOrderNo);
         List<OrderGoodsLog> orderGoodsLogs = new ArrayList<>();
         OrderGoodsLog orderGoodsLog = null;
         for(OrderGoods orderGoods:orderGoodsListByOrderNo){