diff --git a/jianshui-admin/src/main/resources/application-prod.yml b/jianshui-admin/src/main/resources/application-prod.yml index 966b6f5..be50211 100644 --- a/jianshui-admin/src/main/resources/application-prod.yml +++ b/jianshui-admin/src/main/resources/application-prod.yml @@ -90,7 +90,7 @@ elephant_invoice_file: http://dev.goldentaxcloud.com:8081/invoice/fileUrl/ ele_url_v6: https:// # 大象纸票服务对应平台地址 ele_url: http://140.143.226.17:8087/order-api -ele_url_qz: https://openapi.ele-cloud.com/api/ +ele_url_qz: https://openapi.zncspt.com/api/authen/token #logstash: # host: 43.138.58.64:14560 # indexname: jianshui-prod diff --git a/jianshui-admin/src/main/resources/application.yml b/jianshui-admin/src/main/resources/application.yml index 8c96f99..68a7c2f 100644 --- a/jianshui-admin/src/main/resources/application.yml +++ b/jianshui-admin/src/main/resources/application.yml @@ -46,7 +46,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: dev + active: prod # 文件上传 servlet: multipart: diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/task/InvoiceBackTask.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/task/InvoiceBackTask.java index 0c618c1..8f0be70 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/task/InvoiceBackTask.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/task/InvoiceBackTask.java @@ -108,7 +108,7 @@ public class InvoiceBackTask { invoice = new Invoice(); invoice.setOutTradeOrderno(invoiceBack.getSystemOrderno()); invoice.setState(22); - invoice.setMessage(invoiceBack.getResultMsg() != null ? invoiceBack.getResultMsg().substring(0, 200) : ""); + invoice.setMessage((invoiceBack.getResultMsg() != null && invoiceBack.getResultMsg().length() > 200) ? invoiceBack.getResultMsg().substring(0, 200) : invoiceBack.getResultMsg() ); } try { @@ -228,7 +228,7 @@ public class InvoiceBackTask { invoiceBack.setBackMsg("id为空"); invoiceBack.setUpdateTime(new Date()); invoiceBackMapper.updateInvoiceBack(invoiceBack); - break; + continue; } log.info("【重汽回调】订单号{},开始回调", id); @@ -242,7 +242,7 @@ public class InvoiceBackTask { invoiceBack.setBackMsg("未配置回调地址"); invoiceBack.setUpdateTime(new Date()); invoiceBackMapper.updateInvoiceBack(invoiceBack); - break; + continue; } String callBackUrl = secretIdProp.getValue(); @@ -254,8 +254,8 @@ public class InvoiceBackTask { invoice = new Invoice(); invoice.setOutTradeOrderno(invoiceBack.getSystemOrderno()); invoice.setState(22); - invoice.setMessage(invoiceBack.getResultMsg() != null ? invoiceBack.getResultMsg().substring(0, 200) : ""); - break; + invoice.setMessage( (invoiceBack.getResultMsg() != null && invoiceBack.getResultMsg().length() > 200) ? invoiceBack.getResultMsg().substring(0, 200) : invoiceBack.getResultMsg() ); + continue; } try { @@ -284,7 +284,7 @@ public class InvoiceBackTask { invoiceBack.setUpdateTime(new Date()); invoiceBackMapper.updateInvoiceBack(invoiceBack); } - break; + continue; } } catch (Exception e) { log.info("【控制台】发票回调接口,发送数据异常,id={}", id);