From cc6a1a8a151dbbd418f041860827a38a6cadc0ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Wed, 10 Jan 2024 16:10:16 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B9=E6=A0=BC?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=97=B6=E7=9A=84=E8=B0=83=E7=94=A8url?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/FangGeInterfaceServiceImpl.java | 17 ++++++++++++++++- .../order/invoice/config/InvoiceConfig.java | 6 ++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/FangGeInterfaceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/FangGeInterfaceServiceImpl.java index 58fc764f..c669d593 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/FangGeInterfaceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/FangGeInterfaceServiceImpl.java @@ -2241,7 +2241,22 @@ public class FangGeInterfaceServiceImpl implements FangGeInterfaceService { if (OrderInfoEnum.TAX_EQUIPMENT_C48.getKey().equals(terminalCode) || OrderInfoEnum.TAX_EQUIPMENT_D60.getKey().equals(terminalCode)) { terminalCode = OrderInfoEnum.TAX_EQUIPMENT_FGHX.getKey(); } - SqZcxxResponse sqZcxxResponse = HttpInvoiceRequestUtilFg.sqZcxx(invoiceConfig.configSqZcxxFg(), sqZcxxParam, terminalCode); + + String fgSkKpShList = baseServiceConfig.getFgSkKpShList(); + + String url = invoiceConfig.configSqZcxxFg(); + + if (StringUtils.isNotBlank(fgSkKpShList) && StringUtils.isNotBlank(sqZcxxParam.getNSRSBH())) { + String[] fgSkKpList = fgSkKpShList.split(ConfigureConstant.STRING_POINT2); + for (String fgSkKp : fgSkKpList) { + if (sqZcxxParam.getNSRSBH().equals(fgSkKp)) { + url = invoiceConfig.configSqZcxxFg2(); + } + } + } + + SqZcxxResponse sqZcxxResponse = HttpInvoiceRequestUtilFg.sqZcxx(url, sqZcxxParam, terminalCode); + if (ConfigureConstant.STRING_0000.equals(sqZcxxResponse.getCode())) { //注册成功，返回注册码 String zcm = ""; diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/config/InvoiceConfig.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/config/InvoiceConfig.java index 9a4bfe57..b974ad89 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/config/InvoiceConfig.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/config/InvoiceConfig.java @@ -30,6 +30,9 @@ public class InvoiceConfig { */ @Value("${order.url.A9}") private String interfaceA9BusinessUrl; + + @Value("${order.url.jdc}") + private String interfaceJdcBusinessUrl; /** * 预览pdf水印 @@ -554,6 +557,9 @@ public class InvoiceConfig { public String configSqZcxxFg() { return interfaceA9BusinessUrl + "/invoice/business/v1.0/sqZcxx"; } + public String configSqZcxxFg2() { + return interfaceJdcBusinessUrl + "/invoice/business/v1.0/sqZcxx"; + } /** * 调用获取pdf地址 From ae0b5855eefb520901e8835205506d68214cc7aa 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, 11 Jan 2024 08:56:40 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=88=86=E6=9C=BA=E5=8F=B7=E6=97=B6url=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/invoice/config/InvoiceConfig.java | 11 ++++++-- .../service/impl/UnifyServiceImpl.java | 28 +++++++++++++++++-- 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/config/InvoiceConfig.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/config/InvoiceConfig.java index b974ad89..3c3d3b91 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/config/InvoiceConfig.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/config/InvoiceConfig.java @@ -387,6 +387,10 @@ public class InvoiceConfig { public String configQueryNsrXnsbxx() { return interfaceA9BusinessUrl + "/invoice/business/v1.0/queryNsrXnsbxx"; } + + public String configQueryNsrXnsbxx2() { + return interfaceJdcBusinessUrl + "/invoice/business/v1.0/queryNsrXnsbxx"; + } /** * 打印机列表查询 @@ -1211,6 +1215,9 @@ public class InvoiceConfig { public String configFileDownload() { return interfaceQdUrl + "/einvoice-api/api/invoice/V1.0/fileDownload"; } - - + + + public String configGetDiscInfoFg2() { + return interfaceJdcBusinessUrl + "/invoice/business/v1.0/queryDiscinfo"; + } } diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/UnifyServiceImpl.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/UnifyServiceImpl.java index c7bdd51b..2e4bcefd 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/UnifyServiceImpl.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/UnifyServiceImpl.java @@ -239,7 +239,20 @@ public class UnifyServiceImpl implements UnifyService { cpybs = ""; } sldRequest.setCpybs(cpybs); - NsrXnsbxxs nsrXnsbxxs = HttpInvoiceRequestUtil.queryNsrXnsbxx(invoiceConfig.configQueryNsrXnsbxx(), sldRequest, terminalCode); + + String realUrl = invoiceConfig.configQueryNsrXnsbxx(); + String fgSkKpShList = baseServiceConfig.getFgSkKpShList(); + + if (StringUtils.isNotBlank(fgSkKpShList) && StringUtils.isNotBlank(nsrsbh)) { + String[] fgSkKpList = fgSkKpShList.split(ConfigureConstant.STRING_POINT2); + for (String fgSkKp : fgSkKpList) { + if (nsrsbh.equals(fgSkKp)) { + realUrl = invoiceConfig.configQueryNsrXnsbxx2(); + } + } + } + + NsrXnsbxxs nsrXnsbxxs = HttpInvoiceRequestUtil.queryNsrXnsbxx(realUrl, sldRequest, terminalCode); if (ObjectUtil.isNotEmpty(nsrXnsbxxs) && ObjectUtil.isNotEmpty(nsrXnsbxxs.getContent())) { convertToNewTaxFjh(resultList, nsrXnsbxxs.getContent(), nsrsbh, terminalCode); } @@ -747,8 +760,19 @@ public class UnifyServiceImpl implements UnifyService { fgJspxxReqEntity.setJsplx(jspxx); fgJspxxReqEntity.setFpzlDm(fpzldm); + String url = invoiceConfig.configGetDiscInfoFg(); + + if (StringUtils.isNotBlank(fgSkKpShList) && StringUtils.isNotBlank(nsrsbh)) { + String[] fgSkKpList = fgSkKpShList.split(ConfigureConstant.STRING_POINT2); + for (String fgSkKp : fgSkKpList) { + if (nsrsbh.equals(fgSkKp)) { + url = invoiceConfig.configGetDiscInfoFg2(); + } + } + } + SpFpXeDto spFpXeDto = HttpInvoiceRequestUtilFg.querySpZlXeByNsrsbh( - invoiceConfig.configGetDiscInfoFg(), fgJspxxReqEntity, terminalCode); + url, fgJspxxReqEntity, terminalCode); List taxpayerMachineInfoList = new ArrayList<>(); if (ObjectUtil.isNotNull(spFpXeDto)) { if (ConfigureConstant.STRING_0000.equals(spFpXeDto.getCode()) && ObjectUtil.isNotNull(spFpXeDto.getData())) { From 9ac356e6378ccb4a76a0744b736a61d7a0f9a8e5 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, 11 Jan 2024 11:03:31 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=BA=E5=8A=A8?= =?UTF-8?q?=E8=BD=A6=E5=8F=91=E7=A5=A8=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/order/model/sk/kp/CommonInvoiceHeadJdc.java | 2 ++ .../java/com/dxhy/order/invoice/utils/KpTransitionUtils.java | 1 + 2 files changed, 3 insertions(+) diff --git a/order-management-common/src/main/java/com/dxhy/order/model/sk/kp/CommonInvoiceHeadJdc.java b/order-management-common/src/main/java/com/dxhy/order/model/sk/kp/CommonInvoiceHeadJdc.java index 8a5a03f4..5cc545c1 100644 --- a/order-management-common/src/main/java/com/dxhy/order/model/sk/kp/CommonInvoiceHeadJdc.java +++ b/order-management-common/src/main/java/com/dxhy/order/model/sk/kp/CommonInvoiceHeadJdc.java @@ -85,4 +85,6 @@ public class CommonInvoiceHeadJdc { private String BYZD3; + private String JDCFPBZ; + } diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/utils/KpTransitionUtils.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/utils/KpTransitionUtils.java index f454eaf1..57194d4e 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/utils/KpTransitionUtils.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/utils/KpTransitionUtils.java @@ -248,6 +248,7 @@ public class KpTransitionUtils { commonInvoiceHeadJdc.setBYZD2(orderInfoJdc.getByzd1()); commonInvoiceHeadJdc.setBYZD3(orderInfoJdc.getByzd1()); + commonInvoiceHeadJdc.setJDCFPBZ("3"); return commonInvoiceHeadJdc; } From 360a205889d36102744e19d4df9c5a98f49caaf8 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, 11 Jan 2024 12:42:43 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=8E=A8=E9=80=81=E7=A8=8E=E7=9B=98?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=B7=BB=E5=8A=A0=E6=9C=BA=E5=8A=A8=E8=BD=A6?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/MakeOutAnInvoiceServiceImpl.java | 2 +- .../impl/FangGeInterfaceServiceImpl.java | 17 +++++++++++++++-- .../order/invoice/config/InvoiceConfig.java | 10 +++++++--- .../service/impl/FangGeServiceImpl.java | 19 ++++++++++++++++++- .../service/impl/UnifyServiceImpl.java | 4 ++-- 5 files changed, 43 insertions(+), 9 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/MakeOutAnInvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/MakeOutAnInvoiceServiceImpl.java index e389c7e9..4fa2ef72 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/MakeOutAnInvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/MakeOutAnInvoiceServiceImpl.java @@ -616,7 +616,7 @@ public class MakeOutAnInvoiceServiceImpl implements MakeOutAnInvoiceService { //方格开票特殊处理 - if (CommonUtils.judgeIsFgTerminalOld(terminalCode,fgSkKpShList,sh) && (OrderInfoEnum.ORDER_INVOICE_TYPE_12.getKey().equals(orderInfo.getFpzlDm())||OrderInfoEnum.ORDER_INVOICE_TYPE_42.getKey().equals(orderInfo.getFpzlDm()))) { + if (CommonUtils.judgeIsFgTerminalOld(terminalCode,fgSkKpShList,sh)) { for (List invoiceBatchRequestItem1 : insertBatchItem) { for (InvoiceBatchRequestItem batchRequestItem : invoiceBatchRequestItem1) { /** diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/FangGeInterfaceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/FangGeInterfaceServiceImpl.java index c669d593..29325755 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/FangGeInterfaceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/FangGeInterfaceServiceImpl.java @@ -2250,7 +2250,7 @@ public class FangGeInterfaceServiceImpl implements FangGeInterfaceService { String[] fgSkKpList = fgSkKpShList.split(ConfigureConstant.STRING_POINT2); for (String fgSkKp : fgSkKpList) { if (sqZcxxParam.getNSRSBH().equals(fgSkKp)) { - url = invoiceConfig.configSqZcxxFg2(); + url = invoiceConfig.configSqZcxxFgJDC(); } } } @@ -2356,7 +2356,20 @@ public class FangGeInterfaceServiceImpl implements FangGeInterfaceService { } // 调用税控接口,同步税盘信息 - ResponseBaseBean result = HttpInvoiceRequestUtilFg.tbSpxx(invoiceConfig.configTbSpxxFg(), tbSpxxParam, taxEquipmentInfo.getSksbCode()); + String url = invoiceConfig.configTbSpxxFg(); + + String fgSkKpShList = baseServiceConfig.getFgSkKpShList(); + + if (StringUtils.isNotBlank(fgSkKpShList) && StringUtils.isNotBlank(nsrsbh)) { + String[] fgSkKpList = fgSkKpShList.split(ConfigureConstant.STRING_POINT2); + for (String fgSkKp : fgSkKpList) { + if (nsrsbh.equals(fgSkKp)) { + url = invoiceConfig.configTbSpxxFgJDC(); + } + } + } + + ResponseBaseBean result = HttpInvoiceRequestUtilFg.tbSpxx(url, tbSpxxParam, taxEquipmentInfo.getSksbCode()); if (OrderInfoContentEnum.INVOICE_STAT_SUCCESS.getKey().equals(result.getCode())) { //同步信息成功 log.info("同步税盘信息成功"); diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/config/InvoiceConfig.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/config/InvoiceConfig.java index 3c3d3b91..61e37f87 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/config/InvoiceConfig.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/config/InvoiceConfig.java @@ -388,7 +388,7 @@ public class InvoiceConfig { return interfaceA9BusinessUrl + "/invoice/business/v1.0/queryNsrXnsbxx"; } - public String configQueryNsrXnsbxx2() { + public String configQueryNsrXnsbxxJDC() { return interfaceJdcBusinessUrl + "/invoice/business/v1.0/queryNsrXnsbxx"; } @@ -543,6 +543,10 @@ public class InvoiceConfig { public String configTbSpxxFg() { return interfaceA9BusinessUrl + "/invoice/business/v1.0/tbSpxx"; } + + public String configTbSpxxFgJDC() { + return interfaceJdcBusinessUrl + "/invoice/business/v1.0/tbSpxx"; + } /** * 调用税控生成pdf地址 @@ -561,7 +565,7 @@ public class InvoiceConfig { public String configSqZcxxFg() { return interfaceA9BusinessUrl + "/invoice/business/v1.0/sqZcxx"; } - public String configSqZcxxFg2() { + public String configSqZcxxFgJDC() { return interfaceJdcBusinessUrl + "/invoice/business/v1.0/sqZcxx"; } @@ -1217,7 +1221,7 @@ public class InvoiceConfig { } - public String configGetDiscInfoFg2() { + public String configGetDiscInfoFgJDC() { return interfaceJdcBusinessUrl + "/invoice/business/v1.0/queryDiscinfo"; } } diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/fangge/service/impl/FangGeServiceImpl.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/fangge/service/impl/FangGeServiceImpl.java index a499ab24..4fd009b9 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/fangge/service/impl/FangGeServiceImpl.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/fangge/service/impl/FangGeServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.RandomUtil; +import com.dxhy.order.baseservice.config.BaseServiceConfig; import com.dxhy.order.constant.*; import com.dxhy.order.model.InvoicePrintInfo; import com.dxhy.order.model.OrderInvoiceInfo; @@ -74,6 +75,9 @@ public class FangGeServiceImpl implements FangGeService { @Resource private FangGeService fangGeService; + @Resource + private BaseServiceConfig baseServiceConfig; + @Override public void updateUploadRedInvoice(SpecialInvoiceReversalEntity entity) { specialInvoiceReversalMapper.updateByPrimaryKeySelective(entity); @@ -279,7 +283,20 @@ public class FangGeServiceImpl implements FangGeService { spxxParams.add(spxxParam); tbSpxxParam.setJSPXX(spxxParams); // 调用税控接口,同步税盘信息 - HttpInvoiceRequestUtilFg.tbSpxx(invoiceConfig.configTbSpxxFg(), tbSpxxParam, OrderInfoEnum.TAX_EQUIPMENT_FGHX.getKey()); + String url = invoiceConfig.configTbSpxxFg(); + + String fgSkKpShList = baseServiceConfig.getFgSkKpShList(); + + if (StringUtils.isNotBlank(fgSkKpShList) && StringUtils.isNotBlank(xhfNsrsbh)) { + String[] fgSkKpList = fgSkKpShList.split(ConfigureConstant.STRING_POINT2); + for (String fgSkKp : fgSkKpList) { + if (xhfNsrsbh.equals(fgSkKp)) { + url = invoiceConfig.configTbSpxxFgJDC(); + } + } + } + + HttpInvoiceRequestUtilFg.tbSpxx(url, tbSpxxParam, OrderInfoEnum.TAX_EQUIPMENT_FGHX.getKey()); registrationCode.setSpzt(spzt); saveCodeToRedis(registrationCode); log.warn("{}同步税盘状态成功,当前税盘状态为:{}(0:在线,1:离线),税号:{},机器编号:{}", LOGGER_MSG, spzt, xhfNsrsbh, jqbh); diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/UnifyServiceImpl.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/UnifyServiceImpl.java index 2e4bcefd..47e5afe1 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/UnifyServiceImpl.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/UnifyServiceImpl.java @@ -247,7 +247,7 @@ public class UnifyServiceImpl implements UnifyService { String[] fgSkKpList = fgSkKpShList.split(ConfigureConstant.STRING_POINT2); for (String fgSkKp : fgSkKpList) { if (nsrsbh.equals(fgSkKp)) { - realUrl = invoiceConfig.configQueryNsrXnsbxx2(); + realUrl = invoiceConfig.configQueryNsrXnsbxxJDC(); } } } @@ -766,7 +766,7 @@ public class UnifyServiceImpl implements UnifyService { String[] fgSkKpList = fgSkKpShList.split(ConfigureConstant.STRING_POINT2); for (String fgSkKp : fgSkKpList) { if (nsrsbh.equals(fgSkKp)) { - url = invoiceConfig.configGetDiscInfoFg2(); + url = invoiceConfig.configGetDiscInfoFgJDC(); } } } From 1cde4e918cd00b64a9278f3ed5080cdb9d6d1022 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, 11 Jan 2024 16:10:38 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/dxhy/order/model/sk/fg/SpFpXeMxDto.java | 5 +++++ .../module/invoice/service/impl/UnifyServiceImpl.java | 1 + 2 files changed, 6 insertions(+) diff --git a/order-management-common/src/main/java/com/dxhy/order/model/sk/fg/SpFpXeMxDto.java b/order-management-common/src/main/java/com/dxhy/order/model/sk/fg/SpFpXeMxDto.java index 9934b56b..21456b75 100644 --- a/order-management-common/src/main/java/com/dxhy/order/model/sk/fg/SpFpXeMxDto.java +++ b/order-management-common/src/main/java/com/dxhy/order/model/sk/fg/SpFpXeMxDto.java @@ -35,6 +35,11 @@ public class SpFpXeMxDto implements Serializable { */ private String cpyqylx; + /** + * 二手车标识 + */ + private String escbs; + /** * 发票种类明细 */ diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/UnifyServiceImpl.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/UnifyServiceImpl.java index 47e5afe1..c0ec8ac3 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/UnifyServiceImpl.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/UnifyServiceImpl.java @@ -784,6 +784,7 @@ public class UnifyServiceImpl implements UnifyService { taxpayerMachineInfo.setJQBH(fpXeMxDto.getJqbh()); taxpayerMachineInfo.setSPMC(fpXeMxDto.getJqbh()); taxpayerMachineInfo.setCPYBS(fpXeMxDto.getCpyqylx()); + taxpayerMachineInfo.setESCBS(fpXeMxDto.getEscbs()); List invoiceTypeList = new ArrayList<>(); if (ObjectUtil.isNotEmpty(fpXeMxDto.getInvoicetypedetails())) { From b898ebba76dc891420db9f9f5a7d15a684af718c 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, 11 Jan 2024 17:22:43 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E4=B8=80=E5=BC=80?= =?UTF-8?q?=E5=A7=8B=E4=BF=AE=E6=94=B9=E6=9C=BA=E5=8A=A8=E8=BD=A6=E6=A0=87?= =?UTF-8?q?=E5=BF=97=EF=BC=8C=E5=B9=B6=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=9C=A8?= =?UTF-8?q?=E6=96=B9=E6=A0=BC=E8=B0=83=E8=AE=A2=E5=8D=95=E5=A4=84=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/order/model/sk/kp/CommonInvoiceHeadJdc.java | 2 -- .../openapi/service/impl/FangGeInterfaceServiceImpl.java | 1 + .../java/com/dxhy/order/invoice/utils/KpTransitionUtils.java | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/order-management-common/src/main/java/com/dxhy/order/model/sk/kp/CommonInvoiceHeadJdc.java b/order-management-common/src/main/java/com/dxhy/order/model/sk/kp/CommonInvoiceHeadJdc.java index 5cc545c1..8a5a03f4 100644 --- a/order-management-common/src/main/java/com/dxhy/order/model/sk/kp/CommonInvoiceHeadJdc.java +++ b/order-management-common/src/main/java/com/dxhy/order/model/sk/kp/CommonInvoiceHeadJdc.java @@ -85,6 +85,4 @@ public class CommonInvoiceHeadJdc { private String BYZD3; - private String JDCFPBZ; - } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/FangGeInterfaceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/FangGeInterfaceServiceImpl.java index 29325755..d85835e9 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/FangGeInterfaceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/FangGeInterfaceServiceImpl.java @@ -215,6 +215,7 @@ public class FangGeInterfaceServiceImpl implements FangGeInterfaceService { OrderInfoJdcVO orderInfoJdc = orderInfoJdcService.queryOrderInfoJdcByOrderId(info.getOrderInfoId()); if (null != orderInfoJdc) { FgJdctxxBO fgJdctxxBO = BeanTransitionUtils.transitionJdcfgOrderInvoiceHead(orderInfoJdc); + fgJdctxxBO.setJDCFPBZ("3"); fgCommonOrder.setJDCTXX(fgJdctxxBO); } //查询二手车订单数据 diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/utils/KpTransitionUtils.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/utils/KpTransitionUtils.java index 57194d4e..f454eaf1 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/utils/KpTransitionUtils.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/utils/KpTransitionUtils.java @@ -248,7 +248,6 @@ public class KpTransitionUtils { commonInvoiceHeadJdc.setBYZD2(orderInfoJdc.getByzd1()); commonInvoiceHeadJdc.setBYZD3(orderInfoJdc.getByzd1()); - commonInvoiceHeadJdc.setJDCFPBZ("3"); return commonInvoiceHeadJdc; }