Skip to content

T
tax-sys-nacos
Commit 9d9ce270 by ddx
Options

增加用户信息属性

parent e50409ae
Showing with 23 additions and 10 deletions
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 { ...@@ -459,19 +459,20 @@ public class InvoiceFileServiceImpl implements InvoiceFileService {
} else { } else {
String hgResult = queryCollectTaxInfo(uuidFlag, invoiceFileReq, userUrl); String hgResult = queryCollectTaxInfo(uuidFlag, invoiceFileReq, userUrl);
if (StringUtil.isEmpty(hgResult)) { if (StringUtil.isEmpty(hgResult)) {
functionList.add(getFunction01(functionNo, "", "", "", "", "", "", "", "")); functionList.add(getFunction01(functionNo));
} else { } else {
JSONObject jsonStr = JSONObject.parseObject(hgResult); JSONObject jsonStr = JSONObject.parseObject(hgResult);
if (jsonStr != null && !"0".equals(jsonStr.getString("CODE"))) { if (jsonStr != null && !"0".equals(jsonStr.getString("CODE"))) {
functionList.add(getFunction01(functionNo, "", "", "", "", "", "", "", "")); functionList.add(getFunction01(functionNo));
} else { } else {
JSONObject dataJson = jsonStr.getJSONObject("DATA"); JSONObject dataJson = jsonStr.getJSONObject("DATA");
if (dataJson != null) { if (dataJson != null) {
functionList.add(getFunction01(functionNo, dataJson.getString("userStatus"), dataJson.getString("curCollectFlag") functionList.add(getFunction01(functionNo, dataJson.getString("userStatus"), dataJson.getString("curCollectFlag")
, dataJson.getString("lastCollectDate"), dataJson.getString("zone"), dataJson.getString("errorMessage") , 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 { } else {
functionList.add(getFunction01(functionNo, "", "", "", "", "", "", "", "")); functionList.add(getFunction01(functionNo));
} }
} }
} }
...@@ -486,19 +487,20 @@ public class InvoiceFileServiceImpl implements InvoiceFileService { ...@@ -486,19 +487,20 @@ public class InvoiceFileServiceImpl implements InvoiceFileService {
} else { } else {
String hgResult = queryNumberCollectTaxInfo(uuidFlag, invoiceFileReq, userUrl); String hgResult = queryNumberCollectTaxInfo(uuidFlag, invoiceFileReq, userUrl);
if (StringUtil.isEmpty(hgResult)) { if (StringUtil.isEmpty(hgResult)) {
functionList.add(getFunction01(functionNo, "", "", "", "", "", "", "", "")); functionList.add(getFunction01(functionNo));
} else { } else {
JSONObject jsonStr = JSONObject.parseObject(hgResult); JSONObject jsonStr = JSONObject.parseObject(hgResult);
if (jsonStr != null && !"0".equals(jsonStr.getString("CODE"))) { if (jsonStr != null && !"0".equals(jsonStr.getString("CODE"))) {
functionList.add(getFunction01(functionNo, "", "", "", "", "", "", "", "")); functionList.add(getFunction01(functionNo));
} else { } else {
JSONObject dataJson = jsonStr.getJSONObject("DATA"); JSONObject dataJson = jsonStr.getJSONObject("DATA");
if (dataJson != null) { if (dataJson != null) {
functionList.add(getFunction01(functionNo, dataJson.getString("userStatus"), dataJson.getString("curCollectFlag") functionList.add(getFunction01(functionNo, dataJson.getString("userStatus"), dataJson.getString("curCollectFlag")
, dataJson.getString("lastCollectDate"), dataJson.getString("zone"), dataJson.getString("errorMessage") , 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 { } else {
functionList.add(getFunction01(functionNo, "", "", "", "", "", "", "", "")); functionList.add(getFunction01(functionNo));
} }
} }
} }
...@@ -520,7 +522,12 @@ public class InvoiceFileServiceImpl implements InvoiceFileService { ...@@ -520,7 +522,12 @@ public class InvoiceFileServiceImpl implements InvoiceFileService {
return function; 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(); Map function = new HashMap();
function.put("functionNo", functionNo); function.put("functionNo", functionNo);
function.put("taxnoStatus", taxnoStatus); function.put("taxnoStatus", taxnoStatus);
...@@ -531,6 +538,8 @@ public class InvoiceFileServiceImpl implements InvoiceFileService { ...@@ -531,6 +538,8 @@ public class InvoiceFileServiceImpl implements InvoiceFileService {
function.put("errorMessage", errorMessage); function.put("errorMessage", errorMessage);
function.put("validType", validType); function.put("validType", validType);
function.put("invSpec", invSpec); function.put("invSpec", invSpec);
function.put("confType", confType);
function.put("ncpFlag", ncpFlag);
return function; return function;
} }
......
tax-token/token-common/src/main/java/com/tax/token/model/TkUser.java
...@@ -33,7 +33,10 @@ public class TkUser { ...@@ -33,7 +33,10 @@ public class TkUser {
private String toServerNo; private String toServerNo;
public String getLastServerNo(String zoneCode) { public String getLastServerNo(String zoneCode) {
String serverNo = getServerNo(); return getLastServerNo(zoneCode, getServerNo());
}
public String getLastServerNo(String zoneCode, String serverNo) {
if(StringUtil.isNotEmpty(getToServerNo())) { if(StringUtil.isNotEmpty(getToServerNo())) {
String[] serverNoConfigArr = getToServerNo().split(";"); String[] serverNoConfigArr = getToServerNo().split(";");
for(String serverNoConfig:serverNoConfigArr) { 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 { ...@@ -158,6 +158,7 @@ public class TkTokenServiceImpl implements TkTokenService {
TkServerExample serverExample = new TkServerExample(); TkServerExample serverExample = new TkServerExample();
serverExample.createCriteria().andServerNoEqualTo(tkToken.getServerNo()); serverExample.createCriteria().andServerNoEqualTo(tkToken.getServerNo());
TkServer tkServer = tkServerService.selectByExample(serverExample).get(0); TkServer tkServer = tkServerService.selectByExample(serverExample).get(0);
// tkToken.setServerNo(tkUser.getLastServerNo(zoneCode, tkToken.getServerNo()));
tkToken.setZoneFlag(tkUser.getZoneFlag()); tkToken.setZoneFlag(tkUser.getZoneFlag());
tkToken.setFunctionNo(functionNo); tkToken.setFunctionNo(functionNo);
token = getTokenByThird(uuId, tkToken, tkZoneInfo, tkServer,true, "0"); token = getTokenByThird(uuId, tkToken, tkZoneInfo, tkServer,true, "0");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment