Merge branch 'master-fix' into release

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderException/OrderExceptionServiceImpl.java

@@ -1350,22 +1350,23 @@ public class OrderExceptionServiceImpl extends AbstractService<OrderExceptionMap
                 }
 
 
-                List<OrderChangePriceParam> channelPriceParams = new ArrayList<>();
-                if (null != vo.getChannelPriceList() && vo.getChannelPriceList().size() > 0) {
-                    for (OrderExceptionChannelPriceCreateReqVO channelPrice : vo.getChannelPriceList()) {
-                        channelPrice.setExceptionId(vo.getOrderExceptionId());
-                        channelPrice.setExceptionResultId(orderExceptionResult.getId());
-                        orderExceptionChannelPriceService.createExceptionChannelPrice(channelPrice);
-
-                        OrderChangePriceParam priceParam = new OrderChangePriceParam();
-                        BeanUtil.copyProperties(channelPrice, priceParam);
-                        channelPriceParams.add(priceParam);
-                    }
-                }
+//                List<OrderChangePriceParam> channelPriceParams = new ArrayList<>();
+//                if (null != vo.getChannelPriceList() && vo.getChannelPriceList().size() > 0) {
+//                    for (OrderExceptionChannelPriceCreateReqVO channelPrice : vo.getChannelPriceList()) {
+//                        channelPrice.setExceptionId(vo.getOrderExceptionId());
+//                        channelPrice.setExceptionResultId(orderExceptionResult.getId());
+//                        orderExceptionChannelPriceService.createExceptionChannelPrice(channelPrice);
+//
+//                        OrderChangePriceParam priceParam = new OrderChangePriceParam();
+//                        BeanUtil.copyProperties(channelPrice, priceParam);
+//                        channelPriceParams.add(priceParam);
+//                    }
+//                }
 
                 this.updateById(orderExceptionDO);
                 //回调之前保存一下异常状态,防止删除
-                orderBusinessService.handleOrderChannelException(orderExceptionDO.getOrderId(), vo.getChannelId(), vo.getLineId(), channelPriceParams);
+//                orderBusinessService.handleOrderChannelException(orderExceptionDO.getOrderId(), vo.getChannelId(), vo.getLineId(), channelPriceParams);
+                orderBusinessService.handleOrderChannelException(orderExceptionDO.getOrderId(), vo.getChannelId(), vo.getLineId(), null);
             } else {
                 throw exception(ORDER_HANDLER_EXCEPTION_NOT_EXISTS);
             }