优化代码

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

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.json.JSONUtil;
 import com.clx.order.enums.OrderEnum;
 import com.clx.order.feign.OrderFeign;
+import com.clx.order.param.feign.RollbackOrderWeightParam;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.enums.*;
@@ -157,51 +158,37 @@ public class OrderCancelComponent {
         }
     }
 
-//    public void backFillTonnage(OrderGoods orderGoods, BigDecimal weight) {
-//        if (orderGoods.getOrderGoodsStatus().equals(OrderGoodsStatusEnum.Status.CANCEL.getCode())
-//                || orderGoods.getOrderGoodsStatus().equals(OrderGoodsStatusEnum.Status.COMPLETED.getCode())
-//        ) {
-//
-//            //返回到货单
-//            orderGoodsDao.updateOrderGoodsSetResidueWeightAndAlreadyWeight(weight,weight, orderGoods.getId());
-//
-//            if (!orderGoods.getTruckDemand().equals(TruckDemandEnum.TruckType.PLATFORM_ANY_CAR.getCode())) {
-//                for (OrderGoods orderGoods : orderGoodsList) {
-//                    truckDemandMap.put(orderGoods.getTruckDemand(),
-//                            truckDemandMap.get(orderGoods.getTruckDemand())
-//                                    .add(orderGoods.getResidueTransportWeight()));
-//                }
-//            } else {
-//                for (OrderGoods orderGoods : orderGoodsList) {
-//                    vehicleUsageMap.put(orderGoods.getVehicleUsage(),
-//                            vehicleUsageMap.get(orderGoods.getVehicleUsage())
-//                                    .add(orderGoods.getResidueTransportWeight()));
-//                }
-//            }
-//            rollbackOrderWeightParam = new Ro
-//            //归还吨数
-//            if (!orderGoods.getTruckDemand().equals(TruckDemandEnum.TruckType.PLATFORM_ANY_CAR.getCode())) {
-//                rollbackOrderWeightParam.setOrderNo(orderNo);
-//                if (truckDemand.equals(TruckDemandEnum.TruckType.PLATFORM_CAR.getCode())) {
-//                    rollbackOrderWeightParam.setResidueWeight(truckDemandMap.get(truckDemand));
-//                    rollbackOrderWeightParam.setOwnResidueCarryWeight(BigDecimal.ZERO);
-//                    rollbackOrderWeightParam.setPlatformResidueCarryWeight(truckDemandMap.get(truckDemand));
-//                }
-//                if (truckDemand.equals(TruckDemandEnum.TruckType.OWNER_CAR.getCode())) {
-//                    rollbackOrderWeightParam.setResidueWeight(truckDemandMap.get(truckDemand));
-//                    rollbackOrderWeightParam.setOwnResidueCarryWeight(truckDemandMap.get(truckDemand));
-//                    rollbackOrderWeightParam.setPlatformResidueCarryWeight(BigDecimal.ZERO);
-//                }
-//            } else {
-//                BigDecimal platformResidueSum = vehicleUsageMap.get(1);
-//                BigDecimal ownResidueSum = vehicleUsageMap.get(2);
-//                BigDecimal residueSum = platformResidueSum.add(ownResidueSum);
-//                rollbackOrderWeightParam.setOrderNo(orderNo);
-//                rollbackOrderWeightParam.setResidueWeight(residueSum);
-//                rollbackOrderWeightParam.setPlatformResidueCarryWeight(platformResidueSum);
-//                rollbackOrderWeightParam.setOwnResidueCarryWeight(ownResidueSum);
-//            }
-//
-//        }
-//    }
+    public void backFillTonnage(OrderGoods orderGoods, BigDecimal weight) {
+        if (orderGoods.getOrderGoodsStatus().equals(OrderGoodsStatusEnum.Status.CANCEL.getCode())
+                || orderGoods.getOrderGoodsStatus().equals(OrderGoodsStatusEnum.Status.COMPLETED.getCode())
+        ) {
+            Integer truckDemand = orderGoods.getTruckDemand();
+            //返回到货单
+            orderGoodsDao.updateOrderGoodsSetResidueWeightAndAlreadyWeight(weight,weight, orderGoods.getId());
+
+            RollbackOrderWeightParam rollbackOrderWeightParam = new RollbackOrderWeightParam();
+            rollbackOrderWeightParam.setOrderNo(orderGoods.getOrderNo());
+            BigDecimal residueWeight = orderGoods.getResidueTransportWeight().add(weight);
+            rollbackOrderWeightParam.setResidueWeight(residueWeight);
+
+            //归还吨数
+            if (!truckDemand.equals(TruckDemandEnum.TruckType.PLATFORM_ANY_CAR.getCode())) {
+                if (truckDemand.equals(TruckDemandEnum.TruckType.PLATFORM_CAR.getCode())) {
+                    rollbackOrderWeightParam.setOwnResidueCarryWeight(BigDecimal.ZERO);
+                    rollbackOrderWeightParam.setPlatformResidueCarryWeight(residueWeight);
+                }else if (truckDemand.equals(TruckDemandEnum.TruckType.OWNER_CAR.getCode())) {
+                    rollbackOrderWeightParam.setOwnResidueCarryWeight(residueWeight);
+                    rollbackOrderWeightParam.setPlatformResidueCarryWeight(BigDecimal.ZERO);
+                }
+            } else {
+                rollbackOrderWeightParam.setPlatformResidueCarryWeight(residueWeight);
+                rollbackOrderWeightParam.setOwnResidueCarryWeight(residueWeight);
+            }
+
+            Result<Object> result = orderFeign.rollbackOrderWeight(rollbackOrderWeightParam);
+            if (!result.succeed()) {
+                throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "远程调用更新订单余量失败");
+            }
+        }
+    }
 }

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

@@ -572,7 +572,6 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                     rollbackOrderWeightParam.setPlatformResidueCarryWeight(platformResidueSum);
                     rollbackOrderWeightParam.setOwnResidueCarryWeight(ownResidueSum);
                 }
-                orderFeign.rollbackOrderWeight(rollbackOrderWeightParam);
                 break;
 
             case 3: //取消未拉运+未到达货源地吨数