feature: 日志打印修改

jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/ElephantInvoiceServiceImpl.java

@@ -303,9 +303,9 @@ public class ElephantInvoiceServiceImpl implements ElephantInvoiceService {
             ICompanyservicePropService companyserviceProp = SpringUtils.getBean(ICompanyservicePropService.class);
             CompanyserviceProp secretIdProp = companyserviceProp.selectPropByKey(Long.valueOf(companyservice.getIdentity()), "aisino_callback_url");
             String callBackUrl = secretIdProp.getValue();
-            log.info("【控制台】发票回调接口，发送数据开始，callBackUrl={}，param={}", callBackUrl, JSONUtil.toJsonStr(invoice));
+            log.info("【控制台1】发票回调接口，发送数据开始，callBackUrl={}，param={}", callBackUrl, JSONUtil.toJsonStr(invoice));
             String result = HttpUtil.post(callBackUrl, JSONUtil.toJsonStr(invoice));
-            log.info("【控制台】发票回调接口，发送数据结束,接口返回信息={}", result);
+            log.info("【控制台1】发票回调接口，发送数据结束,接口返回信息={}", result);
 
             JSONObject resultObject = JSONObject.parseObject(result);
             if (StringUtils.isNotBlank(resultObject.getString("status")) && "0000".equals(resultObject.getString("status"))){
@@ -759,9 +759,9 @@ public class ElephantInvoiceServiceImpl implements ElephantInvoiceService {
 
         try {
 
-            log.info("【控制台】发票回调接口，发送数据开始，id={}，callBackUrl={}，param={}", id, callBackUrl, JSONUtil.toJsonStr(invoice));
+            log.info("【控制台1】发票回调接口，发送数据开始，id={}，callBackUrl={}，param={}", id, callBackUrl, JSONUtil.toJsonStr(invoice));
             String result = HttpUtil.post(callBackUrl, JSONUtil.toJsonStr(invoice));
-            log.info("【控制台】发票回调接口，发送数据结束，id={},接口返回信息={}", id, result);
+            log.info("【控制台1】发票回调接口，发送数据结束，id={},接口返回信息={}", id, result);
 
             cn.hutool.json.JSONObject jsonObject = JSONUtil.parseObj(result);
             if (jsonObject != null) {
@@ -786,7 +786,7 @@ public class ElephantInvoiceServiceImpl implements ElephantInvoiceService {
                 }
             }
         } catch (Exception e) {
-            log.info("【控制台】发票回调接口，发送数据异常，id={},e={}", id,e);
+            log.info("【控制台1】发票回调接口，发送数据异常，id={},e={}", id,e);
             invoiceBack.setStatus("2");
             invoiceBack.setBackMsg("发送数据异常！");
             invoiceBackMapper.updateInvoiceBack(invoiceBack);

jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiServiceImpl.java

@@ -365,16 +365,16 @@ public class AisinoConsoleInvoiceApiServiceImpl implements IInvoiceApiService {
 
         Invoice invoice = invoiceMapper.selectInvoiceById(id);
         if (invoice == null) {
-            log.info("【控制台】发票信息未查询到，id={}", id);
+            log.info("【控制台1】发票信息未查询到，id={}", id);
             return;
         }
 
         try {
-            log.info("【控制台】发票回调接口，发送数据开始，id={}，参数={}", id,JSONUtil.toJsonStr(invoice));
+            log.info("【控制台1】发票回调接口，发送数据开始，id={}，参数={}", id,JSONUtil.toJsonStr(invoice));
             String result = HttpUtil.post(callBackUrl, JSONUtil.toJsonStr(invoice));
-            log.info("【控制台】发票回调接口，发送数据结束，id={},接口返回信息={}", id, result);
+            log.info("【控制台1】发票回调接口，发送数据结束，id={},接口返回信息={}", id, result);
         } catch (Exception e) {
-            log.info("【控制台】发票回调接口，发送数据异常，id={}", id);
+            log.info("【控制台1】发票回调接口，发送数据异常，id={}", id);
             throw new RuntimeException(e);
         }
 

jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiZhongQiServiceImpl.java

@@ -616,9 +616,9 @@ public class AisinoConsoleInvoiceApiZhongQiServiceImpl implements IInvoiceApiSer
             jsonResult.set("message", invoiceBack.getResultMsg());
             jsonResult.set("data", invoice);*/
 
-            log.info("【控制台】发票回调接口，发送数据开始，id={}，callBackUrl={}，param={}", id, callBackUrl, JSONUtil.toJsonStr(invoice));
+            log.info("【控制台1】发票回调接口，发送数据开始，id={}，callBackUrl={}，param={}", id, callBackUrl, JSONUtil.toJsonStr(invoice));
             String result = HttpUtil.post(callBackUrl, JSONUtil.toJsonStr(invoice));
-            log.info("【控制台】发票回调接口，发送数据结束，id={},接口返回信息={}", id, result);
+            log.info("【控制台1】发票回调接口，发送数据结束，id={},接口返回信息={}", id, result);
 
             cn.hutool.json.JSONObject jsonObject = JSONUtil.parseObj(result);
             if (jsonObject != null) {
@@ -643,7 +643,7 @@ public class AisinoConsoleInvoiceApiZhongQiServiceImpl implements IInvoiceApiSer
                 }
             }
         } catch (Exception e) {
-            log.info("【控制台】发票回调接口，发送数据异常，id={},e={}", id,e);
+            log.info("【控制台1】发票回调接口，发送数据异常，id={},e={}", id,e);
             invoiceBack.setStatus("2");
             invoiceBack.setBackMsg("发送数据异常！");
             invoiceBackMapper.updateInvoiceBack(invoiceBack);

jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ByInspurServiceImpl.java

@@ -3066,9 +3066,9 @@ public class ElephantInvoiceApiV6ByInspurServiceImpl implements IInvoiceApiServi
                invoice.setInvoiceResultMsg("");
             }
 
-            log.info("【控制台】发票回调接口，发送数据开始，id={}，callBackUrl={}，param={}", id, callBackUrl, JSONUtil.toJsonStr(invoice));
+            log.info("【控制台2】发票回调接口，发送数据开始，id={}，callBackUrl={}，param={}", id, callBackUrl, JSONUtil.toJsonStr(invoice));
             String result = HttpUtil.post(callBackUrl, JSONUtil.toJsonStr(invoice));
-            log.info("【控制台】发票回调接口，发送数据结束，id={},接口返回信息={}", id, result);
+            log.info("【控制台2】发票回调接口，发送数据结束，id={},接口返回信息={}", id, result);
 
             cn.hutool.json.JSONObject jsonObject = JSONUtil.parseObj(result);
             if (jsonObject != null) {
@@ -3093,7 +3093,7 @@ public class ElephantInvoiceApiV6ByInspurServiceImpl implements IInvoiceApiServi
                 }
             }
         } catch (Exception e) {
-            log.info("【控制台】发票回调接口，发送数据异常，id={},e={}", id,e);
+            log.info("【控制台2】发票回调接口，发送数据异常，id={},e={}", id,e);
             invoiceBack.setStatus("2");
             invoiceBack.setBackMsg("发送数据异常！");
             invoiceBackMapper.updateInvoiceBack(invoiceBack);

jianshui-invoice/src/main/java/com/jianshui/invoice/task/InvoiceBackTask.java

@@ -442,7 +442,7 @@ public class InvoiceBackTask {
             if (invoice == null) {
                 log.info(ZQ_BACK_DXHY + "重新拉取结果后，发票信息未查询到，id={}", id);
                 invoice = new Invoice();
-                invoice.setOutTradeOrderno(invoiceBack.getSystemOrderno());
+                invoice.setSystemOrderno(invoiceBack.getSystemOrderno());
                 invoice.setState(22);
                 invoice.setMessage((invoiceBack.getResultMsg() != null && invoiceBack.getResultMsg().length() > 200) ? invoiceBack.getResultMsg().substring(0, 200) : invoiceBack.getResultMsg());
                 continue;