修改BUG

performance-web/src/main/java/com/clx/performance/controller/pc/OrderCancelController.java

@@ -24,6 +24,7 @@ public class OrderCancelController {
     @ApiOperation(value = "承运端取消订单", notes = "<br>By:胡宇帆")
     @PostMapping("/platformCancelOrderPre")
     public Result<Object> platformCancelOrderPre(@RequestBody OrderCancelParam param) {
+        param.setCancelType(1);
         orderCancelService.platformCancelOrderPrePC(param);
         return Result.ok();
     }
@@ -31,6 +32,7 @@ public class OrderCancelController {
     @ApiOperation(value = "货主端取消订单", notes = "<br>By:胡宇帆")
     @PostMapping("/ownCancelOrderPre")
     public Result<Object> ownCancelOrderPre(@RequestBody OrderCancelParam param) {
+        param.setCancelType(2);
         orderCancelService.ownerCancelOrderPrePC(param);
         return Result.ok();
     }

performance-web/src/main/java/com/clx/performance/listener/OrderCancelHandler.java

@@ -25,9 +25,9 @@ public class OrderCancelHandler {
         log.info("处理订单取消监听器执行,订单No为{}", message);
         OrderCancelParam param = JSONUtil.toBean(message, OrderCancelParam.class);
         if (ObjectUtil.equals(param.getCancelType(), 1)) {
-            orderCancelService.ownerCancelOrderPrePCMQ(param);
+            orderCancelService.orderCancelProcess(param);
         } else {
-            orderCancelService.ownerCancelOrderPrePCMQ(param);
+            orderCancelService.orderCancelProcess(param);
         }
 
     }

performance-web/src/main/java/com/clx/performance/service/OrderCancelService.java

@@ -16,5 +16,6 @@ public interface OrderCancelService {
 
     void platformCancelOrderPrePC(OrderCancelParam param);
 
-    void ownerCancelOrderPrePCMQ(OrderCancelParam param);
+    void orderCancelProcess(OrderCancelParam param);
+
 }

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

@@ -784,7 +784,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void ownerCancelOrderPrePCMQ(OrderCancelParam param) {
+    public void orderCancelProcess(OrderCancelParam param) {
         Map<Integer, BigDecimal> truckDemandMap = new HashMap<>();
         truckDemandMap.put(TruckDemandEnum.TruckType.PLATFORM_CAR.getCode(), BigDecimal.ZERO);
         truckDemandMap.put(TruckDemandEnum.TruckType.OWNER_CAR.getCode(), BigDecimal.ZERO);
@@ -974,4 +974,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
 
         }
     }
+
+
+
 }
\ No newline at end of file

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

@@ -441,7 +441,10 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
                 }
 
                 orderGoodsTruckBindDao.updateOrderGoodsBindStatus(orderGoodsNo, OrderGoodsTruckBindEnum.Status.CANCEL.getCode());
-                orderChildDao.batchUpdateOrderChildStatus(OrderChildEnum.Status.PLATFORM_CANCEL.getCode(), orderChildList.stream().map(OrderChild::getId).collect(Collectors.toList()));
+                if (CollectionUtils.isNotEmpty(orderChildList)) {
+                    orderChildDao.batchUpdateOrderChildStatus(OrderChildEnum.Status.PLATFORM_CANCEL.getCode(), orderChildList.stream().map(OrderChild::getId).collect(Collectors.toList()));
+
+                }
                 log.info("取消货单,参数：{}", JSONUtil.parse(param));
                 if (orderFeign.rollbackOrderWeight(param).succeed()) {
                     OrderGoods update = new OrderGoods();
@@ -472,7 +475,9 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
                     }
                 }
                 orderGoodsTruckBindDao.updateOrderGoodsBindStatus(orderGoodsNo, OrderGoodsTruckBindEnum.Status.CANCEL.getCode());
-                orderChildDao.batchUpdateOrderChildStatus(OrderChildEnum.Status.PLATFORM_CANCEL.getCode(), orderChildList.stream().map(OrderChild::getId).collect(Collectors.toList()));
+                if (CollectionUtils.isNotEmpty(orderChildList)) {
+                    orderChildDao.batchUpdateOrderChildStatus(OrderChildEnum.Status.PLATFORM_CANCEL.getCode(), orderChildList.stream().map(OrderChild::getId).collect(Collectors.toList()));
+                }
                 log.info("取消货单,参数：{}", JSONUtil.parse(param));
                 if (orderFeign.rollbackOrderWeight(param).succeed()) {
                     orderGoodsDao.updateOrderGoodsSetResidueWeightAndAlreadyWeightAndStatus(BigDecimal.ZERO, sum, OrderGoodsStatusEnum.Status.CANCEL.getCode(), orderGoods.getId());