Commit 25810a1f authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.6.9' into MVP1.6.9

parents 575512b4 787cd8ae
...@@ -2,6 +2,8 @@ package com.yifu.cloud.plus.v1.ekp.vo; ...@@ -2,6 +2,8 @@ package com.yifu.cloud.plus.v1.ekp.vo;
import lombok.Data; import lombok.Data;
import java.util.Date;
/** /**
* @author huych * @author huych
* @description 入账明细推送 * @description 入账明细推送
...@@ -26,7 +28,7 @@ public class EKPEntryPushParam { ...@@ -26,7 +28,7 @@ public class EKPEntryPushParam {
private String fd_recipBkName; private String fd_recipBkName;
/** /**
* 入账日期 * 入账日期(精确)
*/ */
private String fd_date; private String fd_date;
...@@ -51,14 +53,14 @@ public class EKPEntryPushParam { ...@@ -51,14 +53,14 @@ public class EKPEntryPushParam {
private String fd_receiveMoney; private String fd_receiveMoney;
/** /**
* 入账日期(精确) * 入账日期
*/ */
private String fd_daReal; private Date fd_daReal;
/** /**
* 数据同步时间 * 数据同步时间
*/ */
private String fd_daTime; private Date fd_daTime;
/** /**
* 系统交易流水号 * 系统交易流水号
......
...@@ -34,6 +34,7 @@ import org.springframework.util.LinkedMultiValueMap; ...@@ -34,6 +34,7 @@ import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap; import org.springframework.util.MultiValueMap;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
import java.text.ParseException;
import java.time.LocalTime; import java.time.LocalTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -155,15 +156,19 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -155,15 +156,19 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
//封装数据 //封装数据
if (!insertList.isEmpty()) { if (!insertList.isEmpty()) {
log.error("到账明细条数:" + insertList.size()); log.error("到账明细条数:" + insertList.size());
try {
for (MybankEnterpriseTradeQhisdResponseV1.MybankEnterpriseTradeQhisdResponseRdV1 entry : insertList) { for (MybankEnterpriseTradeQhisdResponseV1.MybankEnterpriseTradeQhisdResponseRdV1 entry : insertList) {
EKPEntryPushParam pushParam = new EKPEntryPushParam(); EKPEntryPushParam pushParam = new EKPEntryPushParam();
initValue(entry,pushParam,bankName,bankNo); initValue(entry, pushParam, bankName, bankNo);
String body = sendToEkp(pushParam); String body = sendToEkp(pushParam);
//重试 //重试
if (StringUtils.isBlank(body)){ if (StringUtils.isBlank(body)) {
sendToEkp(pushParam); sendToEkp(pushParam);
} }
} }
}catch (Exception e) {
log.error("到账明细数据推送失败",e);
}
} }
} }
} }
...@@ -364,7 +369,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -364,7 +369,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
} }
public void initValue(MybankEnterpriseTradeQhisdResponseV1.MybankEnterpriseTradeQhisdResponseRdV1 entry, public void initValue(MybankEnterpriseTradeQhisdResponseV1.MybankEnterpriseTradeQhisdResponseRdV1 entry,
EKPEntryPushParam pushParam,String bankName,String bankNo) { EKPEntryPushParam pushParam,String bankName,String bankNo) throws ParseException {
pushParam.setFd_recipName(entry.getRecipName()); pushParam.setFd_recipName(entry.getRecipName());
pushParam.setFd_recipAccountNo(entry.getRecipAccountNo()); pushParam.setFd_recipAccountNo(entry.getRecipAccountNo());
pushParam.setFd_recipBkName(entry.getRecipBkName()); pushParam.setFd_recipBkName(entry.getRecipBkName());
...@@ -373,8 +378,10 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -373,8 +378,10 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
pushParam.setFd_receiveBkNo(bankNo); pushParam.setFd_receiveBkNo(bankNo);
pushParam.setFd_remark(entry.getSummary()); pushParam.setFd_remark(entry.getSummary());
pushParam.setFd_receiveMoney(String.valueOf(entry.getCreditAmount()/100.0)); pushParam.setFd_receiveMoney(String.valueOf(entry.getCreditAmount()/100.0));
pushParam.setFd_daReal(entry.getBusiDate() + " " + entry.getBusiTime()); pushParam.setFd_daReal(DateUtil.parseDate(entry.getBusiDate() + " "
pushParam.setFd_daTime(entry.getBusiDate() + " " + entry.getBusiTime()); + entry.getBusiTime().replace(".",":"),DateUtil.DATETIME_PATTERN_MINUTE));
pushParam.setFd_daTime(DateUtil.parseDate(entry.getBusiDate() + " "
+ entry.getBusiTime().replace(".",":"),DateUtil.DATETIME_PATTERN_MINUTE));
pushParam.setFd_onlySequence(entry.getOnlySequence()); pushParam.setFd_onlySequence(entry.getOnlySequence());
} }
} }
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