From e798d9c6c4c108f122eb3b66870d43b0a532ffb0 Mon Sep 17 00:00:00 2001 From: dongxiaoke <1910333201@qq.com> Date: Wed, 10 Apr 2024 17:37:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feature:=20=E9=87=8D=E6=B1=BD=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E5=BC=80=E7=A5=A8=E5=9B=9E=E6=8E=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../utils/encrypt/JianshuiInvoiceDecryptUtil.java | 2 +- .../com/jianshui/invoice/task/QueryInvoiceTask.java | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/jianshui-common/src/main/java/com/jianshui/common/utils/encrypt/JianshuiInvoiceDecryptUtil.java b/jianshui-common/src/main/java/com/jianshui/common/utils/encrypt/JianshuiInvoiceDecryptUtil.java index f8ef8f4..d19ca43 100644 --- a/jianshui-common/src/main/java/com/jianshui/common/utils/encrypt/JianshuiInvoiceDecryptUtil.java +++ b/jianshui-common/src/main/java/com/jianshui/common/utils/encrypt/JianshuiInvoiceDecryptUtil.java @@ -20,7 +20,7 @@ import java.security.MessageDigest; * 功能描述 * 加密常用类 */ -public class AisinoInvoiceDecryptUtil { +public class JianshuiInvoiceDecryptUtil { private static final String ALGORITHM = "AES/GCM/NoPadding"; private static final int KEY_SIZE = 128; // 密钥长度为128位 diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/task/QueryInvoiceTask.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/task/QueryInvoiceTask.java index fe7af4e..a1b2c4d 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/task/QueryInvoiceTask.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/task/QueryInvoiceTask.java @@ -99,15 +99,16 @@ public class QueryInvoiceTask extends TimerTask { QueryWrapper invoiceBackQueryWrapper = new QueryWrapper<>(); invoiceBackQueryWrapper.eq("system_orderno", invoice.getOutTradeOrderno()); - InvoiceBack invoiceBackVali = invoiceBackMapper.selectOne(invoiceBackQueryWrapper); + InvoiceBack invoiceBackVali = this.invoiceBackMapper.selectOne(invoiceBackQueryWrapper); + log.info("【重汽批量开票】查询回调表信息：{}",JSONUtil.toJsonStr(invoiceBackVali)); if (BeanUtil.isEmpty(invoiceBackVali)) { invoiceBackVali = new InvoiceBack(); invoiceBackVali.setSystemOrderno(invoice.getOutTradeOrderno()); invoiceBackVali.setCreateTime(new Date()); invoiceBackVali.setId(IdUtils.randomUUID()); - invoiceBackVali.setIdentity(companyservice.getIdentity()); + invoiceBackVali.setIdentity(this.companyservice.getIdentity()); invoiceBackVali.setBackUrl(""); invoiceBackVali.setStatus("0"); invoiceBackVali.setCreateTime(new Date()); @@ -116,17 +117,17 @@ public class QueryInvoiceTask extends TimerTask { invoiceBackVali.setResultCode(kpStatus); invoiceBackVali.setResultMsg(kpMsg); invoiceBackVali.setUpdateTime(new Date()); - invoiceBackMapper.insertInvoiceBack(invoiceBackVali); + this.invoiceBackMapper.insertInvoiceBack(invoiceBackVali); } else { invoiceBackVali.setResultCode(kpStatus); invoiceBackVali.setResultMsg(kpMsg); invoiceBackVali.setStatus("0"); invoiceBackVali.setUpdateTime(new Date()); - invoiceBackMapper.updateInvoiceBack(invoiceBackVali); + this.invoiceBackMapper.updateInvoiceBack(invoiceBackVali); } - log.info("【重汽批量开票】发票回调队列开始回调，组装参数：回调参数={}，identity={}，invoiceId={}", invoiceBackVali.toString(),companyservice.getIdentity(),invoice.getId()); - invoiceApiService.callBackAisino(invoiceBackVali, "", companyservice.getIdentity(), invoice.getId()); + log.info("【重汽批量开票】发票回调队列开始回调，组装参数：回调参数={}，identity={}，invoiceId={}", invoiceBackVali.toString(),this.companyservice.getIdentity(),invoice.getId()); + this.invoiceApiService.callBackAisino(invoiceBackVali, "", this.companyservice.getIdentity(), invoice.getId()); log.info("【重汽批量开票】 发票批量开具回调队列处理完成: InvoiceId={}",invoice.getId()); } catch (Exception e) { log.info("【重汽批量开票】发票回调队列失败！invoiceId={},捕捉异常{}", invoice.getId(),e.toString()); From b8a2181c20204274be1aad7947eddd82ee657c11 Mon Sep 17 00:00:00 2001 From: dongxiaoke <1910333201@qq.com> Date: Wed, 10 Apr 2024 18:29:35 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feature:=20=E9=87=8D=E6=B1=BD=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E5=BC=80=E7=A5=A8=E5=9B=9E=E6=8E=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/ElephantInvoiceApiServiceImpl.java | 2 +- .../api/ElephantInvoiceApiV6ServiceImpl.java | 4 ++-- .../invoice/task/QueryInvoiceTask.java | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiServiceImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiServiceImpl.java index d2cbcac..e43716a 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiServiceImpl.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiServiceImpl.java @@ -278,7 +278,7 @@ public class ElephantInvoiceApiServiceImpl implements IInvoiceApiService { // } // 定时拉取保存发票， TODO 处理开票中的问题 - AsyncManager.me().execute(new QueryInvoiceTask(billInfo, companyservice, this)); + AsyncManager.me().execute(new QueryInvoiceTask(billInfo, companyservice, this,null)); HXResponse response = new HXResponse("0000", "同步成功"); response.put("fpqqlsh", billInfo.getSystemOrderno()); diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ServiceImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ServiceImpl.java index 63a168c..c21f42f 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ServiceImpl.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ServiceImpl.java @@ -376,7 +376,7 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService { } // 定时拉取保存发票， TODO 处理开票中的问题 - AsyncManager.me().execute(new QueryInvoiceTask(billInfo, companyservice, this)); + AsyncManager.me().execute(new QueryInvoiceTask(billInfo, companyservice, this,invoiceBackMapper)); // 数电的加入金财表 InvoiceAllApiLog allApiLog = new InvoiceAllApiLog(); @@ -3367,7 +3367,7 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService { } } // 定时拉取保存发票 - AsyncManager.me().execute(new QueryInvoiceTask(billInfo, companyservice, this)); + AsyncManager.me().execute(new QueryInvoiceTask(billInfo, companyservice, this,invoiceBackMapper)); // 数电的加入金财表 InvoiceAllApiLog allApiLog = new InvoiceAllApiLog(); diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/task/QueryInvoiceTask.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/task/QueryInvoiceTask.java index a1b2c4d..569ecf9 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/task/QueryInvoiceTask.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/task/QueryInvoiceTask.java @@ -42,7 +42,7 @@ public class QueryInvoiceTask extends TimerTask { private InvoiceBackMapper invoiceBackMapper; - public QueryInvoiceTask(BillInfo billInfo, Companyservice companyservice, IInvoiceApiService invoiceApiService) { + public QueryInvoiceTask(BillInfo billInfo, Companyservice companyservice, IInvoiceApiService invoiceApiService,InvoiceBackMapper invoiceBackMapper) { this.finalBillInfo = billInfo; this.companyservice = companyservice; this.invoiceApiService = invoiceApiService; @@ -78,7 +78,7 @@ public class QueryInvoiceTask extends TimerTask { queryTimes += 1; redisCache.setCacheObject(keys, queryTimes); log.error("【定时任务】【发票查询】发票信息不存在或还在开票中，再次进入查询：{}", JSONObject.toJSONString(this.finalBillInfo)); - AsyncManager.me().execute(new QueryInvoiceTask(this.finalBillInfo, companyservice, this.invoiceApiService)); + AsyncManager.me().execute(new QueryInvoiceTask(this.finalBillInfo, companyservice, this.invoiceApiService,null)); } else if (invoice == null || StringUtils.equalsAny(Integer.toString(invoice.getState()), "2", "22")) { // 2开票成功 22开票失败 // 再次推送 @@ -93,13 +93,13 @@ public class QueryInvoiceTask extends TimerTask { private void pushCoustomInvoiceInfo(Invoice invoice) { try { - log.info("【重汽批量开票】进入发票批量开具回调队列：InvoiceId={}",invoice.getId()); + log.info("【重汽批量开票】进入发票批量开具回调队列：InvoiceId={},{}",invoice.getId(),invoiceBackMapper); String kpStatus = Integer.toString(invoice.getState()).equals("2") ? "0000":"9999"; String kpMsg = Integer.toString(invoice.getState()).equals("2") ? "开票成功":"开票失败"; QueryWrapper invoiceBackQueryWrapper = new QueryWrapper<>(); invoiceBackQueryWrapper.eq("system_orderno", invoice.getOutTradeOrderno()); - InvoiceBack invoiceBackVali = this.invoiceBackMapper.selectOne(invoiceBackQueryWrapper); + InvoiceBack invoiceBackVali = invoiceBackMapper.selectOne(invoiceBackQueryWrapper); log.info("【重汽批量开票】查询回调表信息：{}",JSONUtil.toJsonStr(invoiceBackVali)); if (BeanUtil.isEmpty(invoiceBackVali)) { @@ -108,7 +108,7 @@ public class QueryInvoiceTask extends TimerTask { invoiceBackVali.setCreateTime(new Date()); invoiceBackVali.setId(IdUtils.randomUUID()); - invoiceBackVali.setIdentity(this.companyservice.getIdentity()); + invoiceBackVali.setIdentity(companyservice.getIdentity()); invoiceBackVali.setBackUrl(""); invoiceBackVali.setStatus("0"); invoiceBackVali.setCreateTime(new Date()); @@ -117,17 +117,17 @@ public class QueryInvoiceTask extends TimerTask { invoiceBackVali.setResultCode(kpStatus); invoiceBackVali.setResultMsg(kpMsg); invoiceBackVali.setUpdateTime(new Date()); - this.invoiceBackMapper.insertInvoiceBack(invoiceBackVali); + invoiceBackMapper.insertInvoiceBack(invoiceBackVali); } else { invoiceBackVali.setResultCode(kpStatus); invoiceBackVali.setResultMsg(kpMsg); invoiceBackVali.setStatus("0"); invoiceBackVali.setUpdateTime(new Date()); - this.invoiceBackMapper.updateInvoiceBack(invoiceBackVali); + invoiceBackMapper.updateInvoiceBack(invoiceBackVali); } - log.info("【重汽批量开票】发票回调队列开始回调，组装参数：回调参数={}，identity={}，invoiceId={}", invoiceBackVali.toString(),this.companyservice.getIdentity(),invoice.getId()); - this.invoiceApiService.callBackAisino(invoiceBackVali, "", this.companyservice.getIdentity(), invoice.getId()); + log.info("【重汽批量开票】发票回调队列开始回调，组装参数：回调参数={}，identity={}，invoiceId={}", invoiceBackVali.toString(),companyservice.getIdentity(),invoice.getId()); + invoiceApiService.callBackAisino(invoiceBackVali, "", companyservice.getIdentity(), invoice.getId()); log.info("【重汽批量开票】 发票批量开具回调队列处理完成: InvoiceId={}",invoice.getId()); } catch (Exception e) { log.info("【重汽批量开票】发票回调队列失败！invoiceId={},捕捉异常{}", invoice.getId(),e.toString()); From 7bee9ee3e76aa8282eae1b7af7e1ace2e7857c4f Mon Sep 17 00:00:00 2001 From: dongxiaoke <1910333201@qq.com> Date: Thu, 11 Apr 2024 09:37:36 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feature:=20=E7=AE=80=E7=A8=8E=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E8=A7=84=E5=88=921.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++- .../invoice/task/InvoiceBackTask.java | 33 +++++++++++++++++++ version.md | 14 ++++++++ 3 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 version.md diff --git a/README.md b/README.md index b135e34..dc88659 100644 --- a/README.md +++ b/README.md @@ -14,4 +14,6 @@ components 的命名方式为： ## 端口 生产全部8000+，测试全部7000+ 生产端口:8080 -测试端口:7080 \ No newline at end of file +测试端口:7080 + +--- 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 723c84c..203fa61 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 @@ -203,6 +203,39 @@ public class InvoiceBackTask } + /** + * @author kk + * @date 2024/4/10 20:32 + * @param: [] + * @return: 重汽数电回推补偿机制。 + */ + public void sdBackInvoice(){ + + // 发票回调补偿机制。 + + + + + + } + + + + + + + + + + + + + + + + + + } diff --git a/version.md b/version.md new file mode 100644 index 0000000..f937d17 --- /dev/null +++ b/version.md @@ -0,0 +1,14 @@ + +# 版本迭代说明 + +ps： +* 代码分支切换，新建release分支，设置为上线分支。 +* beta-prop-all 分支为开发分支。 + +## V 1.0.0 增量SQL 对应sql/100/ +* 2024-4-10 + +### 1.新增内容 +* #### 1.1 新增批量开票接口回调列表 + +* #### 1.2 \ No newline at end of file