Commit 944931dc authored by fangxinjiang's avatar fangxinjiang

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

parents 957edbc5 dfbad3eb
...@@ -1349,11 +1349,15 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -1349,11 +1349,15 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
// 1:获取需要查询结果的非扣税支付任务(发放中的任务)——主表 // 1:获取需要查询结果的非扣税支付任务(发放中的任务)——主表
List<EkpBankResultVo> mainList = ekpBankPayTaskService.getEkpBankMainByNeedResultMain(typeName); List<EkpBankResultVo> mainList = ekpBankPayTaskService.getEkpBankMainByNeedResultMain(typeName);
String statusRemark; String statusRemark;
// 终结态:失败6/8/41或成功7
String failStatus = "41";
int i = 0; int i = 0;
if (mainList != null && !mainList.isEmpty()) { if (mainList != null && !mainList.isEmpty()) {
EkpBankPayTask main; EkpBankPayTask main;
// 是否全部时8:授权失败,如果是,则整单失败 // 是否全部时8:授权失败,如果是,则整单失败
boolean isShouQuanShiBai; boolean isShouQuanShiBai;
// 是否为终结态,是,才下一步
boolean isResultStatus = true;
for (EkpBankResultVo vo : mainList) { for (EkpBankResultVo vo : mainList) {
seqNo = seqNoPre + System.currentTimeMillis() + (i++); seqNo = seqNoPre + System.currentTimeMillis() + (i++);
responseV1 = icbcTransactionFlowQueryService.getResultNoTax(vo, tranDate, tranTime, seqNo, client); responseV1 = icbcTransactionFlowQueryService.getResultNoTax(vo, tranDate, tranTime, seqNo, client);
...@@ -1362,6 +1366,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -1362,6 +1366,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
setIcbcLogBaseInfoNoTax(responseV1, icbcLogList, vo.getFdWxNo(), vo.getFdId()); setIcbcLogBaseInfoNoTax(responseV1, icbcLogList, vo.getFdWxNo(), vo.getFdId());
dataList = responseV1.getRd(); dataList = responseV1.getRd();
isShouQuanShiBai = false; isShouQuanShiBai = false;
isResultStatus = true;
if (dataList != null && !dataList.isEmpty()) { if (dataList != null && !dataList.isEmpty()) {
for (MybankEnterprisePayQpayentResponseV1.MybankEnterprisePayQpayentResponseRdV1 data : dataList) { for (MybankEnterprisePayQpayentResponseV1.MybankEnterprisePayQpayentResponseRdV1 data : dataList) {
if (CommonConstants.EIGHT_STRING.equals(data.getResult())) { if (CommonConstants.EIGHT_STRING.equals(data.getResult())) {
...@@ -1370,8 +1375,16 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -1370,8 +1375,16 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
isShouQuanShiBai = false; isShouQuanShiBai = false;
break; break;
} }
if (!(CommonConstants.SIX_STRING.equals(data.getResult())
|| CommonConstants.SEVEN_STRING.equals(data.getResult())
|| CommonConstants.EIGHT_STRING.equals(data.getResult())
|| failStatus.equals(data.getResult()))) {
isResultStatus = false;
} }
} }
}
// 是否为终结态,是,才下一步
if (isResultStatus) {
// 返回码,交易成功返回0,正表示业务报错,负表示系统报错 // 返回码,交易成功返回0,正表示业务报错,负表示系统报错
if (responseV1.isSuccess() && !isShouQuanShiBai) { if (responseV1.isSuccess() && !isShouQuanShiBai) {
// 生成日志主表 // 生成日志主表
...@@ -1466,6 +1479,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -1466,6 +1479,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
} }
} }
} }
}
if (!icbcLogList.isEmpty()) { if (!icbcLogList.isEmpty()) {
ekpBankIcbcLogService.saveBatch(icbcLogList); ekpBankIcbcLogService.saveBatch(icbcLogList);
} }
...@@ -1489,20 +1503,16 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -1489,20 +1503,16 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
setIcbcLogBaseInfoNoTax(responseV1, icbcLogList, vo.getFdWxNo(), vo.getFdId()); setIcbcLogBaseInfoNoTax(responseV1, icbcLogList, vo.getFdWxNo(), vo.getFdId());
// 返回码,交易成功返回0,正表示业务报错,负表示系统报错 // 返回码,交易成功返回0,正表示业务报错,负表示系统报错
if (responseV1.isSuccess() && responseV1.getRd() != null && !responseV1.getRd().isEmpty()) { if (responseV1.isSuccess() && responseV1.getRd() != null && !responseV1.getRd().isEmpty()) {
// 生成日志主表
logs = new EkpBankGrantLog();
saveNewEkpBankGrantLog(responseV1.getPackageName(), vo, vo.getFdId(), logs, title);
dataList = responseV1.getRd(); dataList = responseV1.getRd();
data = dataList.get(0); data = dataList.get(0);
// 终结态才下一步
if (data != null) { if (data != null && (CommonConstants.SIX_STRING.equals(data.getResult())
|| CommonConstants.SEVEN_STRING.equals(data.getResult())
|| CommonConstants.EIGHT_STRING.equals(data.getResult())
|| failStatus.equals(data.getResult()))) {
money = BigDecimalUtils.safeDivide(new BigDecimal(data.getPayAmt()), new BigDecimal("100"), 2); money = BigDecimalUtils.safeDivide(new BigDecimal(data.getPayAmt()), new BigDecimal("100"), 2);
detailData = new EkpBankGrantDetail(); detailData = new EkpBankGrantDetail();
detailData.setFdId(vo.getFdId()); detailData.setFdId(vo.getFdId());
//detailData.setFdSerialNumber(data.getiSeqno());
// 生成日志主表 // 生成日志主表
logs = new EkpBankGrantLog(); logs = new EkpBankGrantLog();
// 失败总金额 // 失败总金额
......
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