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); 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()); diff --git a/pom.xml b/pom.xml index 2f11df85..bc32409d 100644 --- a/pom.xml +++ b/pom.xml @@ -668,7 +668,7 @@ std /data/logs/ - debug + info dxhy