Skip to content

T
tax-sys-nacos
Commit 5738ed84 by ddx
Options

add oiltype

parent 9d9ce270
Showing with 7 additions and 11 deletions
tax-file-face/file-face-service/src/main/java/com/tax/file/service/impl/InvoiceFileServiceImpl.java
......@@ -470,7 +470,7 @@ public class InvoiceFileServiceImpl implements InvoiceFileService {
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("confType"), dataJson.getString("ncpFlag")));
, dataJson.getString("confType"), dataJson.getString("ncpFlag"), dataJson.getString("oilType")));
} else {
functionList.add(getFunction01(functionNo));
}
......@@ -498,7 +498,7 @@ public class InvoiceFileServiceImpl implements InvoiceFileService {
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("confType"), dataJson.getString("ncpFlag")));
, null, null, null));
} else {
functionList.add(getFunction01(functionNo));
}
......@@ -523,11 +523,12 @@ public class InvoiceFileServiceImpl implements InvoiceFileService {
}
private Map getFunction01(String functionNo) {
return getFunction01(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) {
String errorMessage, String initMonth, String validType, String invSpec, String confType,
String ncpFlag, String oilType) {
Map function = new HashMap();
function.put("functionNo", functionNo);
function.put("taxnoStatus", taxnoStatus);
......@@ -540,6 +541,7 @@ public class InvoiceFileServiceImpl implements InvoiceFileService {
function.put("invSpec", invSpec);
function.put("confType", confType);
function.put("ncpFlag", ncpFlag);
function.put("oilType", oilType);
return function;
}
......@@ -565,8 +567,7 @@ public class InvoiceFileServiceImpl implements InvoiceFileService {
result = ret.getContent();
}
} catch (Exception e) {
e.printStackTrace();
log.error(uuidFlag + " taxno is " + taxno + " queryCollectTaxInfo is error!" + e.getMessage());
log.error(uuidFlag + " taxno is " + taxno + " queryCollectTaxInfo is error!" ,e);
return null;
}
log.info(uuidFlag + " taxno is " + taxno + " queryCollectTaxInfo is end ...");
......@@ -597,7 +598,6 @@ public class InvoiceFileServiceImpl implements InvoiceFileService {
result = ret.getContent();
}
} catch (Exception e) {
e.printStackTrace();
log.error(uuidFlag + " taxno is " + taxno + " is error!", e);
return null;
}
......@@ -876,7 +876,6 @@ public class InvoiceFileServiceImpl implements InvoiceFileService {
ResponseContent ret = HttpHelper.postJsonEntity(requestUrl, json.toString());
resultJson = JSONObject.parseObject(ret.getContent());
} catch (Exception e) {
e.printStackTrace();
log.info(uuidFlag + " taxno is " + taxno + " callTaxInfo is error! ", e);
}
log.info(uuidFlag + " taxno is " + taxno + " callTaxInfo request result:" + (resultJson == null ? "null" : resultJson.toJSONString()));
......@@ -909,7 +908,6 @@ public class InvoiceFileServiceImpl implements InvoiceFileService {
ResponseContent ret = HttpHelper.postJsonEntity(requestUrl, json.toString());
resultJson = JSONObject.parseObject(ret.getContent());
} catch (Exception e) {
e.printStackTrace();
log.info(uuidFlag + " taxno is " + taxno + " callNumberTaxInfo is error! ", e);
}
log.info(uuidFlag + " taxno is " + taxno + " callNumberTaxInfo request result:" + (resultJson == null ? "null" : resultJson.toJSONString()));
......@@ -936,7 +934,6 @@ public class InvoiceFileServiceImpl implements InvoiceFileService {
ResponseContent ret = HttpHelper.postJsonEntity(requestUrl, json.toString());
resultJson = JSONObject.parseObject(ret.getContent());
} catch (Exception e) {
e.printStackTrace();
log.info(uuidFlag + " taxno is " + taxno + " callTax is error! ", e);
}
log.info(uuidFlag + " taxno is " + taxno + " callTax request result:" + (resultJson == null ? "null" : resultJson.toJSONString()));
......@@ -964,7 +961,6 @@ public class InvoiceFileServiceImpl implements InvoiceFileService {
try {
resultJson = JSONObject.parseObject(ret.getContent());
} catch (Exception e) {
e.printStackTrace();
log.info(uuidFlag + " taxno is " + taxno + " saveTokenInfo is error! ", e);
}
log.info(uuidFlag + " taxno is " + taxno + "saveTokenInfo request result:" + (resultJson == null ? "null" : resultJson.toJSONString()));
......
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