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-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 58fc764f..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); } //查询二手车订单数据 @@ -2241,7 +2242,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.configSqZcxxFgJDC(); + } + } + } + + SqZcxxResponse sqZcxxResponse = HttpInvoiceRequestUtilFg.sqZcxx(url, sqZcxxParam, terminalCode); + if (ConfigureConstant.STRING_0000.equals(sqZcxxResponse.getCode())) { //注册成功，返回注册码 String zcm = ""; @@ -2341,7 +2357,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 9a4bfe57..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 @@ -30,6 +30,9 @@ public class InvoiceConfig { */ @Value("${order.url.A9}") private String interfaceA9BusinessUrl; + + @Value("${order.url.jdc}") + private String interfaceJdcBusinessUrl; /** * 预览pdf水印 @@ -384,6 +387,10 @@ public class InvoiceConfig { public String configQueryNsrXnsbxx() { return interfaceA9BusinessUrl + "/invoice/business/v1.0/queryNsrXnsbxx"; } + + public String configQueryNsrXnsbxxJDC() { + return interfaceJdcBusinessUrl + "/invoice/business/v1.0/queryNsrXnsbxx"; + } /** * 打印机列表查询 @@ -536,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地址 @@ -554,6 +565,9 @@ public class InvoiceConfig { public String configSqZcxxFg() { return interfaceA9BusinessUrl + "/invoice/business/v1.0/sqZcxx"; } + public String configSqZcxxFgJDC() { + return interfaceJdcBusinessUrl + "/invoice/business/v1.0/sqZcxx"; + } /** * 调用获取pdf地址 @@ -1205,6 +1219,9 @@ public class InvoiceConfig { public String configFileDownload() { return interfaceQdUrl + "/einvoice-api/api/invoice/V1.0/fileDownload"; } - - + + + 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 c7bdd51b..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 @@ -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.configQueryNsrXnsbxxJDC(); + } + } + } + + 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.configGetDiscInfoFgJDC(); + } + } + } + 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())) { @@ -760,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())) {