From 219e070f6cd86065d158bb0525a51d1facb4f336 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Sat, 2 Dec 2023 16:26:21 +0800 Subject: [PATCH] =?UTF-8?q?feature=201.=E5=A4=84=E7=90=86=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E7=B1=BB=E8=BD=AC=E6=8D=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/dxhy/order/utils/CommonUtils.java | 4 ++-- .../service/impl/FangGeInterfaceServiceImpl.java | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/order-management-common/src/main/java/com/dxhy/order/utils/CommonUtils.java b/order-management-common/src/main/java/com/dxhy/order/utils/CommonUtils.java index 0a860bf6..cf861491 100644 --- a/order-management-common/src/main/java/com/dxhy/order/utils/CommonUtils.java +++ b/order-management-common/src/main/java/com/dxhy/order/utils/CommonUtils.java @@ -1136,7 +1136,7 @@ public class CommonUtils { String[] fgSkKpList = fgSkKpShList.split(ConfigureConstant.STRING_POINT2); for (String fgSkKp : fgSkKpList) { if (sh.equals(fgSkKp)) { - return false; + return true; } } } @@ -1161,7 +1161,7 @@ public class CommonUtils { String[] fgSkKpList = fgSkKpShList.split(ConfigureConstant.STRING_POINT2); for (String fgSkKp : fgSkKpList) { if (sh.equals(fgSkKp)) { - return false; + return true; } } } 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 5a4cc5e7..58fc764f 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 @@ -3021,7 +3021,16 @@ public class FangGeInterfaceServiceImpl implements FangGeInterfaceService { log.info("{}请求税控设备类型为:{}", LOGGER_MSG, terminalCode); FgEnterpriseInfoBo fgEnterpriseInfoBo = new FgEnterpriseInfoBo(); fgEnterpriseInfoBo.setSKSBCODE(terminalCode); - fgEnterpriseInfoBo.setKPFS(CommonUtils.judgeIsFgTerminalNew(terminalCode,fgSkKpShList,sh)? FANGGE_INVOICE_TYPE_1.getKey():FANGGE_INVOICE_TYPE_0.getKey()); + fgEnterpriseInfoBo.setKPFS(FANGGE_INVOICE_TYPE_1.getKey()); + if (StringUtils.isNotBlank(fgSkKpShList) && StringUtils.isNotBlank(sh)) { + String[] fgSkKpList = fgSkKpShList.split(ConfigureConstant.STRING_POINT2); + for (String fgSkKp : fgSkKpList) { + if (sh.equals(fgSkKp)) { + fgEnterpriseInfoBo.setKPFS(FANGGE_INVOICE_TYPE_0.getKey()); + break; + } + } + } fgOrderResponse.setData(fgEnterpriseInfoBo); } catch (Exception e) { fgOrderResponse.setSTATUS_CODE(OrderInfoContentEnum.INVOICE_STAT_ERROR.getKey());