增加用户信息属性

tax-file-face/file-face-service/src/main/java/com/tax/file/service/impl/InvoiceFileServiceImpl.java

@@ -459,19 +459,20 @@ public class InvoiceFileServiceImpl implements InvoiceFileService {
         } else {
             String hgResult = queryCollectTaxInfo(uuidFlag, invoiceFileReq, userUrl);
             if (StringUtil.isEmpty(hgResult)) {
-                functionList.add(getFunction01(functionNo, "", "", "", "", "", "", "", ""));
+                functionList.add(getFunction01(functionNo));
             } else {
                 JSONObject jsonStr = JSONObject.parseObject(hgResult);
                 if (jsonStr != null && !"0".equals(jsonStr.getString("CODE"))) {
-                    functionList.add(getFunction01(functionNo, "", "", "", "", "", "", "", ""));
+                    functionList.add(getFunction01(functionNo));
                 } else {
                     JSONObject dataJson = jsonStr.getJSONObject("DATA");
                     if (dataJson != null) {
                         functionList.add(getFunction01(functionNo, dataJson.getString("userStatus"), dataJson.getString("curCollectFlag")
                                 , dataJson.getString("lastCollectDate"), dataJson.getString("zone"), dataJson.getString("errorMessage")
-                                , dataJson.getString("initMonth"), dataJson.getString("validType"), dataJson.getString("invSpec")));
+                                , dataJson.getString("initMonth"), dataJson.getString("validType"), dataJson.getString("invSpec")
+                                , dataJson.getString("confType"), dataJson.getString("ncpFlag")));
                     } else {
-                        functionList.add(getFunction01(functionNo, "", "", "", "", "", "", "", ""));
+                        functionList.add(getFunction01(functionNo));
                     }
                 }
             }
@@ -486,19 +487,20 @@ public class InvoiceFileServiceImpl implements InvoiceFileService {
         } else {
             String hgResult = queryNumberCollectTaxInfo(uuidFlag, invoiceFileReq, userUrl);
             if (StringUtil.isEmpty(hgResult)) {
-                functionList.add(getFunction01(functionNo, "", "", "", "", "", "", "", ""));
+                functionList.add(getFunction01(functionNo));
             } else {
                 JSONObject jsonStr = JSONObject.parseObject(hgResult);
                 if (jsonStr != null && !"0".equals(jsonStr.getString("CODE"))) {
-                    functionList.add(getFunction01(functionNo, "", "", "", "", "", "", "", ""));
+                    functionList.add(getFunction01(functionNo));
                 } else {
                     JSONObject dataJson = jsonStr.getJSONObject("DATA");
                     if (dataJson != null) {
                         functionList.add(getFunction01(functionNo, dataJson.getString("userStatus"), dataJson.getString("curCollectFlag")
                                 , dataJson.getString("lastCollectDate"), dataJson.getString("zone"), dataJson.getString("errorMessage")
-                                , dataJson.getString("initMonth"), dataJson.getString("validType"), dataJson.getString("invSpec")));
+                                , dataJson.getString("initMonth"), dataJson.getString("validType"), dataJson.getString("invSpec")
+                                , dataJson.getString("confType"), dataJson.getString("ncpFlag")));
                     } else {
-                        functionList.add(getFunction01(functionNo, "", "", "", "", "", "", "", ""));
+                        functionList.add(getFunction01(functionNo));
                     }
                 }
             }
@@ -520,7 +522,12 @@ public class InvoiceFileServiceImpl implements InvoiceFileService {
         return function;
     }
 
-    private Map getFunction01(String functionNo, String taxnoStatus, String curOverFlag, String lastOverDate, String zoneCode, String errorMessage, String initMonth, String validType, String invSpec) {
+    private Map getFunction01(String functionNo) {
+        return getFunction01(functionNo, "", "", "", "", "", "", "", "", "", "");
+    }
+
+    private Map getFunction01(String functionNo, String taxnoStatus, String curOverFlag, String lastOverDate, String zoneCode,
+                              String errorMessage, String initMonth, String validType, String invSpec, String confType, String ncpFlag) {
         Map function = new HashMap();
         function.put("functionNo", functionNo);
         function.put("taxnoStatus", taxnoStatus);
@@ -531,6 +538,8 @@ public class InvoiceFileServiceImpl implements InvoiceFileService {
         function.put("errorMessage", errorMessage);
         function.put("validType", validType);
         function.put("invSpec", invSpec);
+        function.put("confType", confType);
+        function.put("ncpFlag", ncpFlag);
         return function;
     }
 

tax-token/token-common/src/main/java/com/tax/token/model/TkUser.java

@@ -33,7 +33,10 @@ public class TkUser {
     private String toServerNo;
 
     public String getLastServerNo(String zoneCode) {
-        String serverNo = getServerNo();
+        return getLastServerNo(zoneCode, getServerNo());
+    }
+
+    public String getLastServerNo(String zoneCode, String serverNo) {
         if(StringUtil.isNotEmpty(getToServerNo())) {
             String[] serverNoConfigArr = getToServerNo().split(";");
             for(String serverNoConfig:serverNoConfigArr) {

tax-token/token-service/src/main/java/com/tax/token/service/impl/TkTokenServiceImpl.java

@@ -158,6 +158,7 @@ public class TkTokenServiceImpl implements TkTokenService {
                         TkServerExample serverExample = new TkServerExample();
                         serverExample.createCriteria().andServerNoEqualTo(tkToken.getServerNo());
                         TkServer tkServer = tkServerService.selectByExample(serverExample).get(0);
+//                        tkToken.setServerNo(tkUser.getLastServerNo(zoneCode, tkToken.getServerNo()));
                         tkToken.setZoneFlag(tkUser.getZoneFlag());
                         tkToken.setFunctionNo(functionNo);
                         token = getTokenByThird(uuId, tkToken, tkZoneInfo, tkServer,true, "0");