Merge remote-tracking branch 'origin/beta-prop-all' into beta-prop-all

README.md

@@ -15,3 +15,5 @@ components 的命名方式为：
 生产全部8000+，测试全部7000+
 生产端口:8080
 测试端口:7080
+
+---

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位

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());

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();

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(){
+
+        // 发票回调补偿机制。
+
+
+
+
+
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 }

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,7 +93,7 @@ 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") ? "开票成功":"开票失败";
 
@@ -101,6 +101,7 @@ public class QueryInvoiceTask extends TimerTask {
             invoiceBackQueryWrapper.eq("system_orderno", invoice.getOutTradeOrderno());
             InvoiceBack invoiceBackVali = invoiceBackMapper.selectOne(invoiceBackQueryWrapper);
 
+            log.info("【重汽批量开票】查询回调表信息：{}",JSONUtil.toJsonStr(invoiceBackVali));
             if (BeanUtil.isEmpty(invoiceBackVali)) {
                 invoiceBackVali = new InvoiceBack();
                 invoiceBackVali.setSystemOrderno(invoice.getOutTradeOrderno());

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