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(); } } }