From 3f9058de628382c2c91b58bbafe6eba9dba51d4a Mon Sep 17 00:00:00 2001
From: xiang2lin <251481237@qq.com>
Date: Tue, 25 Jun 2024 11:20:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E6=98=93=E6=98=8E=E7=BB=86=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cbs8/entity/TransactionDetailEntity.xml     |  2 +-
 .../impl/TransactionDetailServiceImpl.java      | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/TransactionDetailEntity.xml b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/TransactionDetailEntity.xml
index 8ab505b1..3fa7fc60 100644
--- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/TransactionDetailEntity.xml
+++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/TransactionDetailEntity.xml
@@ -76,7 +76,7 @@
             <if test="openBank != null and openBank !='' "> and field0003 = #{openBank} </if>
             <if test="bankType != null and bankType !='' "> and field0004 = #{bankType} </if>
             <if test="transactionSerialNumber != null and transactionSerialNumber !='' "> and field0005 = #{transactionSerialNumber} </if>
-            <if test="bankTransactionDate != null and bankTransactionDate !='' "> and field0006 = #{bankTransactionDate} </if>
+            <if test="bankTransactionDate != null and bankTransactionDate !='' "> and field0006 >= #{bankTransactionDate} </if>
             <if test="bankSerialNumber != null and bankSerialNumber !='' "> and field0007 = #{bankSerialNumber} </if>
             <if test="currency != null and currency !='' "> and field0008 = #{currency} </if>
             <if test="incurredAmount != null and incurredAmount !='' "> and field0009 = #{incurredAmount} </if>
diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/TransactionDetailServiceImpl.java b/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/TransactionDetailServiceImpl.java
index 328654ed..21cee3ea 100644
--- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/TransactionDetailServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/TransactionDetailServiceImpl.java
@@ -4,6 +4,8 @@ import cn.hutool.core.map.MapBuilder;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpRequest;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.hzya.frame.basedao.service.impl.BaseService;
 import com.hzya.frame.seeyon.cbs8.dao.ITransactionDetailDao;
 import com.hzya.frame.seeyon.cbs8.entity.TransactionDetailEntity;
@@ -38,6 +40,7 @@ public class TransactionDetailServiceImpl extends BaseService<TransactionDetailE
      * @param entity
      * @return
      */
+    @DS("#entity.dataSourceCode")
     @Override
     public List<TransactionDetailEntity> querySerialNumber(TransactionDetailEntity entity) {
         List<TransactionDetailEntity> list = transactionDetailDao.queryList(entity, "TransactionDetailEntity_list_serialNumber");;
@@ -67,16 +70,20 @@ public class TransactionDetailServiceImpl extends BaseService<TransactionDetailE
         String field0013=StringUtil.nullConvert(entity.getOppositeName());//对方户名
         String field0014=StringUtil.nullConvert(entity.getOppositeOpeningBank());//对方开户行
         String field0015=StringUtil.nullConvert(entity.getRemark());//备注
-        String data = String.format(getXmlTemplate(),field0001,field0002,field0003,field0004,field0005,field0006,field0007,field0008,field0009,field0010,field0011,field0012,field0013,field0014,field0015);
+        String data = StrUtil.format(getXmlTemplate(),field0001,field0002,field0003,field0004,field0005,field0006,field0007,field0008,field0009,field0010,field0011,field0012,field0013,field0014,field0015);
         Map<String, String> headerMap = MapBuilder.<String, String>create(true)
                 .put("apiCode", "8000240006")
-                .put("publicKey","ZJYA1vBeY1ai53iNmbAEsw6DImjkXGBkdMailxcBdliFC85Ce7eDIk+3zDUT+v578prj")
-                .put("secretKey","7Gp6OjHrIaQ6R3tXGPrI4morjQyWL+qu4JJschQnkBRtv26VDgGFVYKOy5kMZfd/j3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=")
+                .put("publicKey","ZJYAorA7JuRDfrVjywcx78BFcqlLwthgXNC65TXxxQMUHuxCe7eDIk+3zDUT+v578prj")
+                .put("secretKey","a54vt9Wx7gdBig+4JCkZ/lISIIL2m4ZEyZkXtW0uQVBDHS+V4SVgT6xhNblacri/j3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=")
                 .put("appId","800024")
                 .build();
-        String params = JSON.toJSONString(data);
+        JSONObject paramsTemplate = new JSONObject();
+        paramsTemplate.put("loginName", "hzya_rest");
+        paramsTemplate.put("dataXml", data);
+        String params = JSONObject.toJSONString(paramsTemplate);
+        logger.info("保存交易明细到OA底表请求参数:{}",params);
         String body = HttpRequest.post("http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface").addHeaders(headerMap).body(params).timeout(60000).execute().body();
-        logger.info("保存交易明细到OA底表响应参数",body);
+        logger.info("保存交易明细到OA底表响应参数:{}",body);
     }
 
     /**