Merge remote-tracking branch 'origin/v7.0_small_version_fix_20231120' into test

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

@@ -260,22 +260,22 @@ public class OrderCancelComponent implements InitializingBean {
         //归还吨数
         if (!truckDemand.equals(TruckDemandEnum.TruckType.PLATFORM_ANY_CAR.getCode())) {
             if (truckDemand.equals(TruckDemandEnum.TruckType.PLATFORM_CAR.getCode())) {
-                if(isSub && weight.compareTo(orderInfo.getPlatformResidueCarryWeight()) > 0 ){
+                if(isSub && weight.compareTo(orderInfo.getResidueWeight()) > 0 ){
                     log.warn("货单用车需求: {},订单号：{},货单号：{},平台剩余吨数:{},需要扣减吨数:{},不足扣减",
                             truckDemandValue,orderNo,orderGoods.getOrderGoodsNo(),orderInfo.getPlatformResidueCarryWeight()
                             ,weight);
                     throw new ServiceSystemException(PerformanceResultEnum.ORDER_WEIGHT_LACK);
                 }
                 rollbackOrderWeightParam.setOwnResidueCarryWeight(BigDecimal.ZERO);
-                rollbackOrderWeightParam.setPlatformResidueCarryWeight(weight);
+                rollbackOrderWeightParam.setPlatformResidueCarryWeight(BigDecimal.ZERO);
             } else if (truckDemand.equals(TruckDemandEnum.TruckType.OWNER_CAR.getCode())) {
-                if(isSub && weight.compareTo(orderInfo.getOwnResidueCarryWeight()) > 0 ){
+                if(isSub && weight.compareTo(orderInfo.getResidueWeight()) > 0 ){
                     log.warn("货单用车需求: {},订单号：{},货单号：{},自有剩余吨数:{},需要扣减吨数:{},不足扣减",
                             truckDemandValue,orderNo,orderGoods.getOrderGoodsNo(),orderInfo.getOwnResidueCarryWeight()
                             ,weight);
                     throw new ServiceSystemException(PerformanceResultEnum.ORDER_WEIGHT_LACK);
                 }
-                rollbackOrderWeightParam.setOwnResidueCarryWeight(weight);
+                rollbackOrderWeightParam.setOwnResidueCarryWeight(BigDecimal.ZERO);
                 rollbackOrderWeightParam.setPlatformResidueCarryWeight(BigDecimal.ZERO);
             }
         } else {

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

@@ -136,23 +136,26 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
 
 
                 } else {
-                    RollbackOrderWeightParam param = new RollbackOrderWeightParam();
-                    param.setOrderNo(orderGoods.getOrderNo());
-                    param.setResidueWeight(orderGoods.getResidueTransportWeight());
-                    if (orderGoods.getTruckDemand().equals(TruckDemandEnum.TruckType.PLATFORM_CAR.getCode())
-                            || orderGoods.getTruckDemand().equals(TruckDemandEnum.TruckType.OWNER_CAR.getCode())) {
-                        param.setOwnResidueCarryWeight(BigDecimal.ZERO);
-                        param.setPlatformResidueCarryWeight(BigDecimal.ZERO);
-                    } else {
-                        if (orderGoods.getVehicleUsage().equals(VehicleUsageEnum.Status.PLATFORM.getCode())) {
+                    //大于35吨的归还吨数在这里处理
+                    if(orderGoods.getResidueTransportWeight().compareTo(new BigDecimal("35")) >= 0){
+                        RollbackOrderWeightParam param = new RollbackOrderWeightParam();
+                        param.setOrderNo(orderGoods.getOrderNo());
+                        param.setResidueWeight(orderGoods.getResidueTransportWeight());
+                        if (orderGoods.getTruckDemand().equals(TruckDemandEnum.TruckType.PLATFORM_CAR.getCode())
+                                || orderGoods.getTruckDemand().equals(TruckDemandEnum.TruckType.OWNER_CAR.getCode())) {
                             param.setOwnResidueCarryWeight(BigDecimal.ZERO);
-                            param.setPlatformResidueCarryWeight(orderGoods.getResidueTransportWeight());
-                        } else if (orderGoods.getVehicleUsage().equals(VehicleUsageEnum.Status.OWN.getCode())) {
-                            param.setOwnResidueCarryWeight(orderGoods.getResidueTransportWeight());
                             param.setPlatformResidueCarryWeight(BigDecimal.ZERO);
+                        } else {
+                            if (orderGoods.getVehicleUsage().equals(VehicleUsageEnum.Status.PLATFORM.getCode())) {
+                                param.setOwnResidueCarryWeight(BigDecimal.ZERO);
+                                param.setPlatformResidueCarryWeight(orderGoods.getResidueTransportWeight());
+                            } else if (orderGoods.getVehicleUsage().equals(VehicleUsageEnum.Status.OWN.getCode())) {
+                                param.setOwnResidueCarryWeight(orderGoods.getResidueTransportWeight());
+                                param.setPlatformResidueCarryWeight(BigDecimal.ZERO);
+                            }
                         }
+                        orderFeign.rollbackOrderWeight(param);
                     }
-                    orderFeign.rollbackOrderWeight(param);
                     //更新已完结
                     orderGoodsDao.updateOrderGoodsStatusByOrderGoodsNo(orderGoodsNo, OrderGoodsStatusEnum.Status.COMPLETED.getCode());