Merge branch 'release' into test

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);

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());

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>