From d181fd4f4992ef018639308ca7905775c813248c Mon Sep 17 00:00:00 2001 From: gaorl Date: Thu, 27 Jul 2023 12:12:12 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E6=98=8E=E7=BB=86=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E5=AD=98=E5=9C=A8=E5=8D=95=E6=9D=A1=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=8F=82=E4=B8=8E=E5=90=88=E5=B9=B6=E6=95=B0=E6=8D=AE=E7=9A=84?= =?UTF-8?q?=EF=BC=8C=E6=AF=94=E5=AF=B9=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/service/impl/OrderInfoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java index 1de3d7f9..472e23a2 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java @@ -2063,7 +2063,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { try { R r = mergeOrderItem(entId,orderInfoId, null); if(!ConfigureConstant.STRING_0000.equals(r.getCode())){ - return R.error(String.format("结算单号%s明细行合并失败",ddh)); + return r; } } catch (Exception e) { log.error("批量合并报错orderInfoId:{},entId:{},报错信息:{}",orderInfoId,entId,e);