Commit 5eee0160 authored by huyuchen's avatar huyuchen

huych-工行入账调整

parent bbaf00a2
...@@ -44,7 +44,7 @@ public interface EkpSocialInfoMapper extends BaseMapper<EkpSocialInfo> { ...@@ -44,7 +44,7 @@ public interface EkpSocialInfoMapper extends BaseMapper<EkpSocialInfo> {
List<Map<String,String>> getAllserioNo(); List<Map<String,String>> getAllserioNo();
/** /**
* 获取近天的到账明细的交易流水号 * 获取近天的到账明细的交易流水号
* @param * @param
* @return * @return
*/ */
......
...@@ -16,6 +16,7 @@ import com.yifu.cloud.plus.v1.ekp.mapper.EkpSocialInfoMapper; ...@@ -16,6 +16,7 @@ import com.yifu.cloud.plus.v1.ekp.mapper.EkpSocialInfoMapper;
import com.yifu.cloud.plus.v1.ekp.service.EkpBankCodeSetService; import com.yifu.cloud.plus.v1.ekp.service.EkpBankCodeSetService;
import com.yifu.cloud.plus.v1.ekp.service.IcbcTransactionFlowQueryService; import com.yifu.cloud.plus.v1.ekp.service.IcbcTransactionFlowQueryService;
import com.yifu.cloud.plus.v1.ekp.vo.EKPEntryPushParam; import com.yifu.cloud.plus.v1.ekp.vo.EKPEntryPushParam;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil; import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R; import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import io.micrometer.core.instrument.util.StringUtils; import io.micrometer.core.instrument.util.StringUtils;
...@@ -216,11 +217,13 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -216,11 +217,13 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
request.setServiceUrl(icbcConfigProperties.getServerUrl()); request.setServiceUrl(icbcConfigProperties.getServerUrl());
request.setBizContent(bizContent); request.setBizContent(bizContent);
MybankEnterpriseTradeQhisdResponseV1 response = client.execute(request); MybankEnterpriseTradeQhisdResponseV1 response = client.execute(request);
if(response.isSuccess()) { List<MybankEnterpriseTradeQhisdResponseV1.MybankEnterpriseTradeQhisdResponseRdV1> valueList = new ArrayList<>();
if (response.isSuccess()) {
getInfoList(request, valueList, client, bizContent);
// 获取所有账号的流水,每个账号存一个流水 // 获取所有账号的流水,每个账号存一个流水
accountRecordListMap.put(accountInfo.get("bank_no"),response.getRd()); accountRecordListMap.put(accountInfo.get("bank_no"), valueList);
if(accountInfo.get("bank_no").equals(response.getAccountNo())){ if (accountInfo.get("bank_no").equals(response.getAccountNo())) {
accountInfoMap.put(accountInfo.get("bank_no"),response.getAccountName()); accountInfoMap.put(accountInfo.get("bank_no"), response.getAccountName());
} }
} }
} }
...@@ -294,6 +297,24 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -294,6 +297,24 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
return R.ok(); return R.ok();
} }
private void getInfoList(MybankEnterpriseTradeQhisdRequestV1 request,
List<MybankEnterpriseTradeQhisdResponseV1.MybankEnterpriseTradeQhisdResponseRdV1> valueList,
DefaultIcbcClient client, MybankEnterpriseTradeQhisdRequestV1.MybankEnterpriseTradeQhisdRequestBizV1 bizContent) {
try {
MybankEnterpriseTradeQhisdResponseV1 response = client.execute(request);
if (response.isSuccess()) {
valueList.addAll(response.getRd());
if (Common.isNotNull(response.getNextTag())) {
bizContent.setNextTag(response.getNextTag());
request.setBizContent(bizContent);
getInfoList(request, valueList,client,bizContent);
}
}
} catch (Exception e){
log.error("异常", e);
}
}
//推送数据 //推送数据
private String sendToEkp(EKPEntryPushParam pushParam){ private String sendToEkp(EKPEntryPushParam pushParam){
RestTemplate yourRestTemplate = new RestTemplate(); RestTemplate yourRestTemplate = new RestTemplate();
......
...@@ -124,10 +124,10 @@ ...@@ -124,10 +124,10 @@
and fd_3b57f8de9df354 = '是' and fd_3b57f8de9df354 = '是'
</select> </select>
<!--ekp1.9.12查询近天的所有入账记录数据, 查账号和流水号--> <!--ekp1.9.12查询近天的所有入账记录数据, 查账号和流水号-->
<select id="getAllserioNoLsatSevenDays" resultType="Map"> <select id="getAllserioNoLsatSevenDays" resultType="Map">
SELECT fd_3b573843db30ce as onlySequence,fd_3b62f3470beb30 as receiveBkNo from ekp_79c234bf64d412294f23 SELECT fd_3b573843db30ce as onlySequence,fd_3b62f3470beb30 as receiveBkNo from ekp_79c234bf64d412294f23
where DATE_FORMAT(fd_3aa4531d3b86e0, '%Y-%m-%d') between DATE_SUB(curdate(), INTERVAL 7 day) and DATE_ADD(now(), INTERVAL 1 day) where DATE_FORMAT(fd_3aa4531d3b86e0, '%Y-%m-%d') between DATE_SUB(curdate(), INTERVAL 3 day) and DATE_ADD(now(), INTERVAL 1 day)
and fd_3b57f8de9df354 = '是' and fd_3b57f8de9df354 = '是'
</select> </select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment