处理BUg

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

@@ -10,7 +10,7 @@ public interface OrderCancelService {
 //
     void ownerCancelOrderPre(String orderNo);
 //
-//    void ownerCancelOrder(String orderNo);
+    void ownerCancelOrder(String orderNo);
 
     void ownerCancelOrderPrePC(OrderCancelParam param);
 

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

@@ -129,10 +129,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                 }
                 orderGoodsDao.updateEntityByKey(update);
             }
-            Result<Object> result = orderFeign.updateOrderStatusByOrderNo(orderNo, OrderEnum.Status.COMPLETED.getCode());
-            if (!result.succeed()) {
-                throw new RuntimeException("货主取消订单失败,原因：远程调用取消订单失败");
-            }
+
         }
         //TODO 注意判断普通单还是网运单 普通单类型 1  网运单 2
 
@@ -142,6 +139,10 @@ public class OrderCancelServiceImpl implements OrderCancelService {
         log.info("执行解冻账户,参数：{}", JSONUtil.parse(thawAccountParam));
         ownerAccountService.ownerAccountThaw(thawAccountParam);
         this.ownerCancelOrder(orderNo);
+        Result<Object> result = orderFeign.updateOrderStatusByOrderNo(orderNo, OrderEnum.Status.COMPLETED.getCode());
+        if (!result.succeed()) {
+            throw new RuntimeException("货主取消订单失败,原因：远程调用取消订单失败");
+        }
         //       log.info("执行货主订单取消前置：更改相关状态完毕，开始执行吨数回填，发送MQ消息,订单No {}", orderNo);
 //        OrderCancelMqParam mqParam = new OrderCancelMqParam();
 //        mqParam.setType("2");
@@ -153,6 +154,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
 
     }
 
+    @Override
     public void ownerCancelOrder(String orderNo) {
         log.info("开始执行订单取消吨数回填");
         FeignOrderVO orderInfoFeignVO = orderFeign.getOrderInfoFeign(orderNo);
@@ -171,9 +173,13 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                     driverService.updateOrderStatus(orderChild.getDriverUserNo(), DriverInfoEnum.DriverStatus.NO.getCode(), orderChild.getTruckId(), 1);
                     ids.add(orderChild.getId());
                 }
+
+                if (CollectionUtil.isNotEmpty(ids)) {
                     orderChildDao.batchUpdateOrderChildStatus(
                             OrderChildEnum.Status.OWNER_CANCEL.getCode(),
                             ids);
+                }
+
 
                 Map<String, List<OrderGoods>> orderGoodsMap = orderGoodsList.stream()
                         .collect(Collectors.groupingBy(OrderGoods::getOrderGoodsNo));
@@ -247,9 +253,13 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                     driverService.updateOrderStatus(orderChild.getDriverUserNo(), DriverInfoEnum.DriverStatus.NO.getCode(), orderChild.getTruckId(), 1);
                     ids.add(orderChild.getId());
                 }
+
+                if (CollectionUtil.isNotEmpty(ids)) {
                     orderChildDao.batchUpdateOrderChildStatus(
                             OrderChildEnum.Status.OWNER_CANCEL.getCode(),
                             ids);
+                }
+
                 //货单
                 Map<String, List<OrderGoods>> orderGoodsMap = orderGoodsList.stream()
                         .collect(Collectors.groupingBy(OrderGoods::getOrderGoodsNo));