feature 1.处理实体类转换问题

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

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