diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java index c87c3f96..e38a9f0a 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java @@ -996,7 +996,7 @@ public class OrderMergeServiceImpl implements OrderMergeService { } if(orderItemInfoList.isEmpty()){ - R.error("当前勾选明细行未发现满足合并条件的数据"); + return R.error("当前勾选明细行未发现满足合并条件的数据"); } mergeOutItem.addAll(orderItemInfoList); log.debug("明细合并合并后{}", JSONObject.toJSONString(mergeOutItem));