修改BUG

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

@@ -465,7 +465,6 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                 break;
 
             default:
-                log.info("===================");
                 throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "参数有误");
 
         }

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

@@ -5,6 +5,7 @@ import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.order.enums.UpdateEnum;
 import com.clx.order.enums.VehicleUsageEnum;
 import com.clx.order.feign.OrderFeign;
 import com.clx.order.param.feign.OrderCancelReasonParam;
@@ -281,7 +282,13 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateEditOrderGoods(UpdateEditOrderGoodsParam param) {
-        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        UserSessionData loginUserInfo = null;
+        try {
+            loginUserInfo  = TokenUtil.getLoginUserInfo();
+
+        }catch (Exception e) {
+
+        }
         OrderGoodsEditParams orderGoodsParams = param.getOrderGoodsParams();
         OrderGoods oldOrderGoods = orderGoodsDao.getByOrderGoodsNo(orderGoodsParams.getOrderGoodsNo()).get();
         FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(param.getOrderNo());
@@ -290,13 +297,25 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
         }
         BigDecimal answer = orderGoodsParams.getExtractWeight().subtract(oldOrderGoods.getExtractWeight());
         int flag = answer.compareTo(BigDecimal.ZERO);
+        //归还吨数
+        RollbackOrderWeightParam rollbackOrderWeightParam = new RollbackOrderWeightParam();
+        rollbackOrderWeightParam.setOrderNo(param.getOrderNo());
+
         if (flag >= 0) {
             orderGoodsParams.setResidueTransportWeight(oldOrderGoods.getResidueTransportWeight().add(answer));
+            rollbackOrderWeightParam.setUpdateType(UpdateEnum.SUB.getCode());
+            if (oldOrderGoods.getTruckDemand().equals(TruckDemandEnum.TruckType.PLATFORM_CAR.getCode())) {
+                rollbackOrderWeightParam.setResidueWeight(answer);
+                rollbackOrderWeightParam.setOwnResidueCarryWeight(BigDecimal.ZERO);
+                rollbackOrderWeightParam.setPlatformResidueCarryWeight(answer);
+            }else if (oldOrderGoods.getTruckDemand().equals(TruckDemandEnum.TruckType.OWNER_CAR.getCode())) {
+                rollbackOrderWeightParam.setResidueWeight(answer);
+                rollbackOrderWeightParam.setOwnResidueCarryWeight(answer);
+                rollbackOrderWeightParam.setPlatformResidueCarryWeight(BigDecimal.ZERO);
+            }
         }else {
             orderGoodsParams.setResidueTransportWeight(orderGoodsParams.getExtractWeight().subtract(oldOrderGoods.getAlreadyTransportWeight()));
-            //归还吨数
-            RollbackOrderWeightParam rollbackOrderWeightParam = new RollbackOrderWeightParam();
-            rollbackOrderWeightParam.setOrderNo(param.getOrderNo());
+            rollbackOrderWeightParam.setUpdateType(UpdateEnum.ADD.getCode());
             if (oldOrderGoods.getTruckDemand().equals(TruckDemandEnum.TruckType.PLATFORM_CAR.getCode())) {
                 rollbackOrderWeightParam.setResidueWeight(answer.negate());
                 rollbackOrderWeightParam.setOwnResidueCarryWeight(BigDecimal.ZERO);
@@ -306,8 +325,8 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
                 rollbackOrderWeightParam.setOwnResidueCarryWeight(answer.negate());
                 rollbackOrderWeightParam.setPlatformResidueCarryWeight(BigDecimal.ZERO);
             }
-            orderFeign.rollbackOrderWeight(rollbackOrderWeightParam);
         }
+        orderFeign.rollbackOrderWeight(rollbackOrderWeightParam);
 
         if (new BigDecimal(orderInfoFeign.getResidueWeight()).compareTo(orderGoodsParams.getExtractWeight().subtract(oldOrderGoods.getExtractWeight())) < 0) {
             throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "当前货单提取吨数已超订单可提取吨数");
@@ -339,7 +358,10 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
             List<OrderGoodsTruckBind> deleteList = truckBindList.stream().filter(i -> !i.getStatus().equals(OrderGoodsTruckBindEnum.Status.GET.getCode())).collect(Collectors.toList());
             //已接单的记录
             getChildList = truckBindList.stream().filter(i -> i.getStatus().equals(OrderGoodsTruckBindEnum.Status.GET.getCode())).collect(Collectors.toList());
-            orderGoodsTruckBindDao.deleteByIds(deleteList.stream().map(OrderGoodsTruckBind::getId).collect(Collectors.toList()));
+
+            if (CollectionUtils.isNotEmpty(deleteList)) {
+                orderGoodsTruckBindDao.deleteByIds(deleteList.stream().map(OrderGoodsTruckBind::getId).collect(Collectors.toList()));
+            }
             for (OrderGoodsTruckBind bind : deleteList) {
                 goodsOrderTruckRecordComponent.deleteTruckRecord(orderGoodsNo, bind.getTruckNo());
             }