diff --git a/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoice/v1/InvoiceController.java b/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoice/v1/InvoiceController.java index 12f41eb..8ff6f72 100644 --- a/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoice/v1/InvoiceController.java +++ b/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoice/v1/InvoiceController.java @@ -1979,7 +1979,7 @@ public class InvoiceController { invoiceBack.setCreateTime(new Date()); invoiceBackMapper.insertInvoiceBack(invoiceBack); - invoiceService.callBackAisino(invoiceBackTemp,"", Long.valueOf(identity)); + invoiceService.callBackAisino(invoiceBack,"", Long.valueOf(identity)); } log.info("[重汽批量开票接口]提交开票异常,开票失败!identity={},msg={}", identity, resultHx.getMessage()); continue; @@ -2007,7 +2007,7 @@ public class InvoiceController { invoiceBack.setCreateTime(new Date()); invoiceBackMapper.insertInvoiceBack(invoiceBack); - invoiceService.callBackAisino(invoiceBackTemp,"", Long.valueOf(identity)); + invoiceService.callBackAisino(invoiceBack,"", Long.valueOf(identity)); } log.info("[重汽批量开票接口]提交开票异常,开票失败!identity={},e={}", identity, e); diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/BillInfo.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/BillInfo.java index a42e6d8..ee35a4f 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/BillInfo.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/BillInfo.java @@ -421,6 +421,7 @@ public class BillInfo extends BaseEntity @TableField(exist=false) /** 发动机号*/ private String vehicleNo; + private String enginNo; @TableField(exist=false) /** 生产企业名称*/ @@ -439,6 +440,14 @@ public class BillInfo extends BaseEntity /** 机动车发票票面版式标志*/ private String InfoClientAddressPhone; + public String getEnginNo() { + return enginNo; + } + + public void setEnginNo(String enginNo) { + this.enginNo = enginNo; + } + public String getJdcbz() { return jdcbz; } diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/adapter/request/aisino_jn/HxBillInfoDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/adapter/request/aisino_jn/HxBillInfoDTO.java index 671ff9b..bd5f604 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/adapter/request/aisino_jn/HxBillInfoDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/adapter/request/aisino_jn/HxBillInfoDTO.java @@ -487,6 +487,7 @@ public class HxBillInfoDTO extends BillInfo { private String commInspectionNo; /** 发动机号*/ private String vehicleNo; + private String enginNo; /** 生产企业名称*/ private String ManufacturerName; /** 价税合计*/ diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/aisino/console/AisinoConsoleInvoiceAddDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/aisino/console/AisinoConsoleInvoiceAddDTO.java index 8a46807..cb771a5 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/aisino/console/AisinoConsoleInvoiceAddDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/aisino/console/AisinoConsoleInvoiceAddDTO.java @@ -137,8 +137,10 @@ public class AisinoConsoleInvoiceAddDTO { private String impCertificateNo; /** 商检单号*/ private String commInspectionNo; - /** 发动机号*/ + /** 车辆识别代号/车架号码*/ private String vehicleNo; + /** 发动机号*/ + private String enginNo; /** 生产企业名称*/ private String ManufacturerName; /** 价税合计*/ diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiZhongQiServiceImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiZhongQiServiceImpl.java index 2227ede..4830ddb 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiZhongQiServiceImpl.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiZhongQiServiceImpl.java @@ -302,7 +302,7 @@ public class AisinoConsoleInvoiceApiZhongQiServiceImpl implements IInvoiceApiSer } else if ("2".equals(jdcbz)) { aisinoConsoleInvoiceAddDTO.setJDCBZ("1"); } else { - aisinoConsoleInvoiceAddDTO.setJDCBZ("2"); + aisinoConsoleInvoiceAddDTO.setJDCBZ("0"); } //hutool的beancopy别名会与JSONUTIl冲突 @@ -458,17 +458,20 @@ public class AisinoConsoleInvoiceApiZhongQiServiceImpl implements IInvoiceApiSer Invoice invoice = invoiceMapper.selectInvoiceById(id); if (invoice == null) { log.info("【控制台】发票信息未查询到,id={}", id); + invoice = new Invoice(); + invoice.setOutTradeOrderno(invoiceBack.getSystemOrderno()); + invoice.setState(22); + invoice.setMessage(invoiceBack.getResultMsg()); } - cn.hutool.json.JSONObject jsonResult = new cn.hutool.json.JSONObject(); - jsonResult.set("status", invoiceBack.getResultCode()); - jsonResult.set("message", invoiceBack.getResultMsg()); - jsonResult.set("data", invoice); - try { + /*cn.hutool.json.JSONObject jsonResult = new cn.hutool.json.JSONObject(); + jsonResult.set("status", invoiceBack.getResultCode()); + jsonResult.set("message", invoiceBack.getResultMsg()); + jsonResult.set("data", invoice);*/ - log.info("【控制台】发票回调接口,发送数据开始,id={}", id); - String result = HttpUtil.post(callBackUrl, JSONUtil.toJsonStr(jsonResult)); + log.info("【控制台】发票回调接口,发送数据开始,id={},callBackUrl={},param={}", id,callBackUrl,JSONUtil.toJsonStr(invoice)); + String result = HttpUtil.post(callBackUrl, JSONUtil.toJsonStr(invoice)); log.info("【控制台】发票回调接口,发送数据结束,id={},接口返回信息={}", id, result); cn.hutool.json.JSONObject jsonObject = JSONUtil.parseObj(result); 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 888f86c..6340960 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 @@ -82,20 +82,20 @@ public class InvoiceBackTask Invoice invoice = invoiceMapper.selectByOutTradeOrderno(Long.valueOf(identity),id,"0"); if (invoice == null) { log.info("【控制台】发票信息未查询到,id={}", id); - invoiceBack.setStatus("3"); - invoiceBack.setBackMsg("发票信息未查询到"); - invoiceBackMapper.updateInvoiceBack(invoiceBack); - break; + invoice = new Invoice(); + invoice.setOutTradeOrderno(invoiceBack.getSystemOrderno()); + invoice.setState(22); + invoice.setMessage(invoiceBack.getResultMsg()); } try { - cn.hutool.json.JSONObject jsonResult = new cn.hutool.json.JSONObject(); + /*cn.hutool.json.JSONObject jsonResult = new cn.hutool.json.JSONObject(); jsonResult.set("status",invoiceBack.getResultCode()); jsonResult.set("message",invoiceBack.getResultMsg()); - jsonResult.set("data",invoice); + jsonResult.set("data",invoice);*/ - log.info("【控制台】发票回调接口,发送数据开始,id={},orderno={}", id,invoice.getOutTradeOrderno()); - String result = HttpUtil.post(callBackUrl, JSONUtil.toJsonStr(jsonResult)); + log.info("【控制台】发票回调接口,发送数据开始,id={},orderno={},callBackUrl={},param={}", id,invoice.getOutTradeOrderno(),callBackUrl,JSONUtil.toJsonStr(invoice)); + String result = HttpUtil.post(callBackUrl, JSONUtil.toJsonStr(invoice)); log.info("【控制台】发票回调接口,发送数据结束,id={},接口返回信息={}", id, result); JSONObject jsonObject = JSONUtil.parseObj(result); if(jsonObject != null){