From 4e70d59c7dda6c8eaadc92ad0d0d9fcf011e04e6 Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 4 Jul 2023 18:45:22 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E5=90=88=E5=B9=B6=E6=98=8E?= =?UTF-8?q?=E7=BB=86?= 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 b70a2234..2b30ac98 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 @@ -2033,7 +2033,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { collect = orderItemInfos.stream().filter(t -> StringUtils.isNotBlank(t.getSpbm()) && StringUtils.isNotBlank(t.getZxbm())).collect(Collectors.toList()); } //税编为空的不允许合并 - if(orderItemInfos.size() != collect.size()){ + if(itemList.size() != collect.size()){ return R.error("税收编码为空的不允许合并，请先更新税收编码"); } TaxEquipmentInfo taxEquipmentInfo = simsBackService.queryTaxEquipment(orderInfo.getNsrsbh(), entId);