From 2c25c323dca1006ea803d23f814434e058bd82b4 Mon Sep 17 00:00:00 2001 From: gaorl Date: Fri, 26 May 2023 17:03:55 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E6=89=B9=E9=87=8F=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E5=90=88=E5=B9=B6?= 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 fb086c14..9629b95d 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 @@ -1941,7 +1941,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { String entId = t.getString("entId"); String ddh = t.getString("ddh"); try { - R r = mergeOrderItem(orderInfoId, entId, null); + R r = mergeOrderItem(entId,orderInfoId, null); if(!ConfigureConstant.STRING_0000.equals(r.getCode())){ return R.error(String.format("结算单号%s明细行合并失败",ddh)); }