feature 1.修改矿产品清单标志传参

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) ||

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 带清单