From 4865ce282d1274a30c470b841b16d5f7d6224103 Mon Sep 17 00:00:00 2001 From: gaorl Date: Sun, 25 Jun 2023 11:11:55 +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?= 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, 2 insertions(+) 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 a7acdecf..812ce2f3 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 @@ -2062,6 +2062,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { deleteItem.addAll(value.stream().map(t->t.getId()).collect(Collectors.toList())); }else{ log.info("订单id:{}合并明细超过0.06暂时不合并",orderInfoId); + return R.error("明细行号{}合并错误,合并明细超过0.06暂时不合并",orderItemInfo.getSphxh()); } } // OrderInfo orderInfo = new OrderInfo(); @@ -2076,6 +2077,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { // orderProcessInfo.setHjbhsje(); // orderProcessInfo.setKpse(); // orderProcessService.updateOrderProcessInfoByProcessId(orderProcessInfo,null); + log.debug("合并明细{}",JSONObject.toJSONString(orderItemInfoList)); if(!orderItemInfoList.isEmpty()){ orderItemInfoMapper.deleteItemByItemId(deleteItem); orderItemInfoMapper.insertOrderItemByList(orderItemInfoList);