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

performance-web/src/main/java/com/clx/performance/component/OrderCancelComponent.java

@@ -190,21 +190,20 @@ public class OrderCancelComponent implements InitializingBean {
 
             RollbackOrderWeightParam rollbackOrderWeightParam = new RollbackOrderWeightParam();
             rollbackOrderWeightParam.setOrderNo(orderGoods.getOrderNo());
-            BigDecimal residueWeight = orderGoods.getResidueTransportWeight().add(weight);
-            rollbackOrderWeightParam.setResidueWeight(residueWeight);
+            rollbackOrderWeightParam.setResidueWeight(weight);
 
             //归还吨数
             if (!truckDemand.equals(TruckDemandEnum.TruckType.PLATFORM_ANY_CAR.getCode())) {
                 if (truckDemand.equals(TruckDemandEnum.TruckType.PLATFORM_CAR.getCode())) {
                     rollbackOrderWeightParam.setOwnResidueCarryWeight(BigDecimal.ZERO);
-                    rollbackOrderWeightParam.setPlatformResidueCarryWeight(residueWeight);
+                    rollbackOrderWeightParam.setPlatformResidueCarryWeight(weight);
                 } else if (truckDemand.equals(TruckDemandEnum.TruckType.OWNER_CAR.getCode())) {
-                    rollbackOrderWeightParam.setOwnResidueCarryWeight(residueWeight);
+                    rollbackOrderWeightParam.setOwnResidueCarryWeight(weight);
                     rollbackOrderWeightParam.setPlatformResidueCarryWeight(BigDecimal.ZERO);
                 }
             } else {
-                rollbackOrderWeightParam.setPlatformResidueCarryWeight(residueWeight);
-                rollbackOrderWeightParam.setOwnResidueCarryWeight(residueWeight);
+                rollbackOrderWeightParam.setPlatformResidueCarryWeight(weight);
+                rollbackOrderWeightParam.setOwnResidueCarryWeight(weight);
             }
 
             Result<Object> result = orderFeign.rollbackOrderWeight(rollbackOrderWeightParam);

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

@@ -684,7 +684,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         BigDecimal dif = param.getLoadNet().subtract(orderChild.getWeight());
 
         if (orderGoods.getResidueTransportWeight().compareTo(dif) < 0) {
-            throw new ServiceSystemException(PerformanceResultEnum.ORDER_WEIGHT_LACK);
+            throw new ServiceSystemException(PerformanceResultEnum.ORDER_GOODS_WEIGHT_NOT_HAVE);
         }
 
         orderChild.setLoadRough(param.getLoadRough());