Merge remote-tracking branch 'origin/v5.7_break_contract_reverse_20231020' into…

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

@@ -136,6 +136,8 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         return update(lUdWrapper()
                 .eq(OrderChild::getId, item.getId())
                 .set(OrderChild::getCancelRemark, item.getCancelRemark())
+                .set(OrderChild::getCancelType, item.getCancelType())
+                .set(OrderChild::getCancelDetail, item.getCancelDetail())
                 .set(OrderChild::getCancelTime, item.getCancelTime())
                 .set(OrderChild::getFinishTime, item.getFinishTime())
                 .set(OrderChild::getStatus, item.getStatus())

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

@@ -458,7 +458,9 @@ public class OrderCancelServiceImpl implements OrderCancelService {
 //                    update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.CANCEL.getCode());
                    // orderGoodsDao.updateOrderGoodsSetResidueWeightAndAlreadyWeight(BigDecimal.ZERO, BigDecimal.ZERO, orderGoods.getId());
                 }
-                orderGoodsDao.batchUpdateOrderGoodsWeight(BigDecimal.ZERO, ids);
+                if (CollectionUtil.isNotEmpty(ids)) {
+                    orderGoodsDao.batchUpdateOrderGoodsWeight(BigDecimal.ZERO, ids);
+                }
 
             }
 
@@ -540,7 +542,9 @@ public class OrderCancelServiceImpl implements OrderCancelService {
 //                    //update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.COMPLETED.getCode());
 //                    orderGoodsDao.updateEntityByKey(update);
                 }
-                orderGoodsDao.batchUpdateOrderGoodsWeight(BigDecimal.ZERO, ids);
+                if (CollectionUtil.isNotEmpty(ids)) {
+                    orderGoodsDao.batchUpdateOrderGoodsWeight(BigDecimal.ZERO, ids);
+                }
 
             }
 

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

@@ -1071,7 +1071,6 @@ public class OrderChildServiceImpl implements OrderChildService {
                     orderChild.getTruckNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
         }
 
-        orderChild.setCancelRemark(param.getRemark());
         orderChild.setCancelTime(LocalDateTime.now());
         orderChild.setFinishTime(orderChild.getCancelTime());
         orderChild.setStatus(OrderChildEnum.Status.DRIVER_CANCEL.getCode());
@@ -1445,7 +1444,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         }
         if (orderChild.getLoadNet() != null) {return orderChild.getLoadNet();}
 
-        return orderChild.getTruckLoad();
+        return orderChild.getWeight();
     }
 
     /**