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 @@ and field0003 = #{openBank} and field0004 = #{bankType} and field0005 = #{transactionSerialNumber} - and field0006 = #{bankTransactionDate} + and field0006 >= #{bankTransactionDate} and field0007 = #{bankSerialNumber} and field0008 = #{currency} and field0009 = #{incurredAmount} 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 querySerialNumber(TransactionDetailEntity entity) { List list = transactionDetailDao.queryList(entity, "TransactionDetailEntity_list_serialNumber");; @@ -67,16 +70,20 @@ public class TransactionDetailServiceImpl extends BaseService headerMap = MapBuilder.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); } /**