From 3e9a6028caf5f465e70283db343b68b9a3f78761 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Tue, 25 Apr 2023 19:55:08 +0800 Subject: [PATCH] =?UTF-8?q?feature=201.=E7=9F=BF=E4=BA=A7=E5=93=81-?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=BA=A2=E5=AD=97=E4=BF=A1=E6=81=AF=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/dxhy/order/constant/OrderInfoEnum.java | 1 + .../invoicespecial/service/impl/SpecialInvoiceServiceImpl.java | 3 +++ 2 files changed, 4 insertions(+) diff --git a/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java b/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java index 1ff45208..ca98b7b9 100644 --- a/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java +++ b/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java @@ -696,6 +696,7 @@ public enum OrderInfoEnum { SPECIAL_YYSBZ_0000000020("0000000020", "差额税"), SPECIAL_YYSBZ_0000000060("0000000060", "农产品收购"), SPECIAL_YYSBZ_0000000090("0000000090", "成品油"), + SPECIAL_YYSBZ_0000000016("0000000016", "矿产品"), SPECIAL_YYSBZ_0000000000("0000000000", "其他"), 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 7b78ea76..16d0c2fc 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 @@ -212,6 +212,9 @@ public class SpecialInvoiceServiceImpl implements SpecialInvoiceService { tksj = DateUtil.format(specialInvoiceReversal.getTksj(), ConfigureConstant.DATE_FORMAT_DATE_YMDHMS); } hzfpsqbsHead.setTKSJ(tksj); + if(OrderInfoEnum.TAX_EQUIPMENT_A9.getKey().equals(terminalCode) && StringUtils.isNotBlank(specialInvoiceReversal.getYysbz()) && OrderInfoEnum.SPECIAL_YYSBZ_0000000016.getKey().equals(specialInvoiceReversal.getYysbz())){ + specialInvoiceReversal.setYysbz(OrderInfoEnum.SPECIAL_YYSBZ_0000000000.getKey()); + } hzfpsqbsHead.setYYSBZ(StringUtils.isBlank(specialInvoiceReversal.getYysbz()) ? OrderInfoEnum.SPECIAL_YYSBZ_0000000000.getKey() : specialInvoiceReversal.getYysbz());