From 6f0aab4db4b4b3b07a2da7b84bdd459a4312cd17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Fri, 22 Dec 2023 18:12:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BA=A2=E5=AD=97?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=A1=A8=E9=87=8D=E5=A4=8D=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=AF=BC=E8=87=B4=E7=8A=B6=E6=80=81=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SpecialInvoiceServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoicespecial/service/impl/SpecialInvoiceServiceImpl.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoicespecial/service/impl/SpecialInvoiceServiceImpl.java index e173f9ed..2c6a8997 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoicespecial/service/impl/SpecialInvoiceServiceImpl.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoicespecial/service/impl/SpecialInvoiceServiceImpl.java @@ -3243,10 +3243,12 @@ public class SpecialInvoiceServiceImpl implements SpecialInvoiceService { //调用方格税控接口返回成功时，取内层报文更新红字信息表状态 //调用方格税控接口返回失败时，取外层报文更新红字信息表状态 if(ConfigureConstant.STRING_0000.equals(interfaceData.getReturnCode())){ + if (StringUtils.isBlank(specialInvoiceReversalEntity1.getXxbbh()) || !"TZD0000".equals(specialInvoiceReversalEntity1.getStatusCode())){ + udpateSpecialInvoice.setStatusCode(responseHzfpsqbsc.getXXBZT()); + udpateSpecialInvoice.setStatusMessage(responseHzfpsqbsc.getZTMX()); + } udpateSpecialInvoice.setXxbbh(responseHzfpsqbsc.getXXBBH()); udpateSpecialInvoice.setSqdh(responseHzfpsqbsc.getSQDH()); - udpateSpecialInvoice.setStatusCode(responseHzfpsqbsc.getXXBZT()); - udpateSpecialInvoice.setStatusMessage(responseHzfpsqbsc.getZTMX()); udpateSpecialInvoice.setScfgStatus(ConfigureConstant.STRING_0); } else { udpateSpecialInvoice.setStatusCode(interfaceData.getReturnCode()); From 47e31f132caeee57dbfa33fd00c22787819ddc32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Thu, 28 Dec 2023 13:48:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B0=86=E5=AD=97=E7=AC=A6=E4=B8=B2?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E4=B8=BA=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../invoicespecial/service/impl/SpecialInvoiceServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoicespecial/service/impl/SpecialInvoiceServiceImpl.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoicespecial/service/impl/SpecialInvoiceServiceImpl.java index 2c6a8997..d76f25d2 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoicespecial/service/impl/SpecialInvoiceServiceImpl.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoicespecial/service/impl/SpecialInvoiceServiceImpl.java @@ -3243,7 +3243,7 @@ public class SpecialInvoiceServiceImpl implements SpecialInvoiceService { //调用方格税控接口返回成功时，取内层报文更新红字信息表状态 //调用方格税控接口返回失败时，取外层报文更新红字信息表状态 if(ConfigureConstant.STRING_0000.equals(interfaceData.getReturnCode())){ - if (StringUtils.isBlank(specialInvoiceReversalEntity1.getXxbbh()) || !"TZD0000".equals(specialInvoiceReversalEntity1.getStatusCode())){ + if (StringUtils.isBlank(specialInvoiceReversalEntity1.getXxbbh()) || !OrderInfoEnum.SPECIAL_INVOICE_STATUS_TZD0000.getKey().equals(specialInvoiceReversalEntity1.getStatusCode())){ udpateSpecialInvoice.setStatusCode(responseHzfpsqbsc.getXXBZT()); udpateSpecialInvoice.setStatusMessage(responseHzfpsqbsc.getZTMX()); }