From 58002555b7ac082b9b0ec5ab4b7078aa1a323110 Mon Sep 17 00:00:00 2001
From: WangQi <1021674882@qq.com>
Date: Fri, 30 Jun 2023 10:26:38 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E7=BA=A7=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2f11df85..bc32409d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -668,7 +668,7 @@
             <properties>
                 <deployType>std</deployType>
                 <logging.file>/data/logs/</logging.file>
-                <logging.level>debug</logging.level>
+                <logging.level>info</logging.level>
                 <logback.mysql.url>
                     <![CDATA[jdbc:mysql://10.1.2.226:3306/sales_manager?useUnicode=true&amp;characterEncoding=utf8&amp;useSSL=false&amp;serverTimezone=Asia/Shanghai&amp;allowMultiQueries=true]]></logback.mysql.url>
                 <logback.mysql.user>dxhy</logback.mysql.user>

From 98544a42a4eee5ca18fccd0fe83074e35d3158c6 Mon Sep 17 00:00:00 2001
From: gaorl <gaoronglin@ele-cloud.com>
Date: Tue, 4 Jul 2023 13:49:15 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feature=EF=BC=9A=E6=8E=A5=E5=8F=A3=E6=89=B9?=
 =?UTF-8?q?=E6=AC=A1=E5=8F=B7=E9=87=8D=E5=A4=8D=E8=BF=94=E5=9B=9E=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../consumer/openapi/service/impl/InterfaceServiceImplV6.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV6.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV6.java
index cc0f67dc..6aa0e3cb 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV6.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV6.java
@@ -297,7 +297,7 @@ public class InterfaceServiceImplV6 implements InterfaceServiceV6 {
             ddpcxxRspV5.setZTDM(InterfaceEnum.INTERFACE_V5_GENERATEINVOICE_010000.getKey());
             ddpcxxRspV5.setZTXX(InterfaceEnum.INTERFACE_V5_GENERATEINVOICE_010000.getMessage());
         } else if(StringUtils.equals(OrderInfoContentEnum.INVOICE_ERROR_CODE_010001_V3.getKey(),ddpcxxRspV5.getZTDM())){
-            ddpcxxRspV5.setZTDM(InterfaceEnum.INTERFACE_V5_GENERATEINVOICE_702001.getKey());
+            ddpcxxRspV5.setZTDM(InterfaceEnum.INTERFACE_V5_GENERATEINVOICE_010000.getKey());
             ddpcxxRspV5.setZTXX(InterfaceEnum.INTERFACE_V5_GENERATEINVOICE_702001.getMessage());
         } else if(StringUtils.equals(InterfaceEnum.INTERFACE_V5_STATUS_009999.getKey(),ddpcxxRspV5.getZTDM())){
             ddpcxxRspV5.setZTDM(InterfaceEnum.INTERFACE_V5_GENERATEINVOICE_029999.getKey());

From 4e70d59c7dda6c8eaadc92ad0d0d9fcf011e04e6 Mon Sep 17 00:00:00 2001
From: gaorl <gaoronglin@ele-cloud.com>
Date: Tue, 4 Jul 2023 18:45:22 +0800
Subject: [PATCH 3/3] =?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);