From ec740a506adb4238263811735c4fe6d755513131 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Sun, 23 Apr 2023 11:22:40 +0800 Subject: [PATCH] =?UTF-8?q?feature=201.=E4=BF=AE=E6=94=B9=E7=9F=BF?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=B8=85=E5=8D=95=E6=A0=87=E5=BF=97=E4=BC=A0?= =?UTF-8?q?=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/order/utils/CommonUtils.java | 20 +++++++++---------- .../invoice/utils/HttpInvoiceRequestUtil.java | 4 +++- 2 files changed, 13 insertions(+), 11 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 dee9de4f..12cb4908 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 @@ -1132,16 +1132,16 @@ public class CommonUtils { * @date 2021-09-07 */ public static boolean judgeIsFgTerminalNew(String terminalCode, String fgSkKpShList, String sh) { - boolean isSkQd = false; - if (StringUtils.isNotBlank(fgSkKpShList) && StringUtils.isNotBlank(sh)) { - String[] fgSkKpList = fgSkKpShList.split(ConfigureConstant.STRING_POINT2); - for (String fgSkKp : fgSkKpList) { - if (sh.equals(fgSkKp)) { - isSkQd = true; - break; - } - } - } + boolean isSkQd = true; +// if (StringUtils.isNotBlank(fgSkKpShList) && StringUtils.isNotBlank(sh)) { +// String[] fgSkKpList = fgSkKpShList.split(ConfigureConstant.STRING_POINT2); +// for (String fgSkKp : fgSkKpList) { +// if (sh.equals(fgSkKp)) { +// isSkQd = true; +// break; +// } +// } +// } return (OrderInfoEnum.TAX_EQUIPMENT_FGBW.getKey().equals(terminalCode) || OrderInfoEnum.TAX_EQUIPMENT_FGHX.getKey().equals(terminalCode) || diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/utils/HttpInvoiceRequestUtil.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/utils/HttpInvoiceRequestUtil.java index c865b953..281fd37b 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/utils/HttpInvoiceRequestUtil.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/utils/HttpInvoiceRequestUtil.java @@ -1264,7 +1264,7 @@ public class HttpInvoiceRequestUtil { invoiceIssueInfo.setZSFS(zsfs); String qdbz = commonInvoiceHead.getQD_BZ(); - if (OrderInfoEnum.QDBZ_CODE_2.getKey().equals(qdbz) || OrderInfoEnum.QDBZ_CODE_4.getKey().equals(qdbz)) { + if (OrderInfoEnum.QDBZ_CODE_2.getKey().equals(qdbz) || OrderInfoEnum.QDBZ_CODE_4.getKey().equals(qdbz)|| OrderInfoEnum.QDBZ_CODE_7.getKey().equals(qdbz)) { qdbz = OrderInfoEnum.QDBZ_CODE_0.getKey(); } else if (OrderInfoEnum.QDBZ_CODE_3.getKey().equals(qdbz)) { qdbz = OrderInfoEnum.QDBZ_CODE_1.getKey(); @@ -1272,6 +1272,8 @@ public class HttpInvoiceRequestUtil { qdbz = OrderInfoEnum.QDBZ_CODE_0.getKey(); } else if (OrderInfoEnum.QDBZ_CODE_6.getKey().equals(qdbz)) { qdbz = OrderInfoEnum.QDBZ_CODE_1.getKey(); + }else if (OrderInfoEnum.QDBZ_CODE_8.getKey().equals(qdbz)) { + qdbz = OrderInfoEnum.QDBZ_CODE_1.getKey(); } //百望服务器清单标志特殊处理逻辑 清单标志只能为 0 不带清单 1 带清单