修改BUG

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

@@ -583,10 +583,11 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                 }
 
                 orderGoodsList = orderGoodsDao.getOrderGoodsListByOrderNo(orderNo);
-
-                orderGoodsDao.batchUpdateOrderGoodsStatus(
-                        OrderGoodsStatusEnum.Status.CANCEL.getCode(),
-                        orderGoodsList.stream().map(OrderGoods::getId).collect(Collectors.toList()));
+                if (CollectionUtil.isNotEmpty(orderGoodsList)) {
+                    orderGoodsDao.batchUpdateOrderGoodsStatus(
+                            OrderGoodsStatusEnum.Status.CANCEL.getCode(),
+                            orderGoodsList.stream().map(OrderGoods::getId).collect(Collectors.toList()));
+                }
                 Result<Object> result = orderFeign.updateOrderStatusByOrderNo(orderNo, OrderEnum.Status.CANCELED.getCode());
                 if (!result.succeed()) {
                     throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "货主取消订单失败,原因：远程调用取消订单失败");
@@ -688,9 +689,13 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                     throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "当前订单已发生变化,请重新选择取消方式");
                 }
                 orderGoodsList = orderGoodsDao.getOrderGoodsListByOrderNo(orderNo);
-                orderGoodsDao.batchUpdateOrderGoodsStatus(
-                        OrderGoodsStatusEnum.Status.CANCEL.getCode(),
-                        orderGoodsList.stream().map(OrderGoods::getId).collect(Collectors.toList()));
+
+                if (CollectionUtil.isNotEmpty(orderGoodsList)) {
+                    orderGoodsDao.batchUpdateOrderGoodsStatus(
+                            OrderGoodsStatusEnum.Status.CANCEL.getCode(),
+                            orderGoodsList.stream().map(OrderGoods::getId).collect(Collectors.toList()));
+                }
+
                 Result<Object> result = orderFeign.updateOrderStatusByOrderNo(orderNo, OrderEnum.Status.CANCELED.getCode());
                 if (!result.succeed()) {
                     throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "货主取消订单失败,原因：远程调用取消订单失败");