Commit 34d2a345 authored by fangxinjiang's avatar fangxinjiang

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

parents 4791f720 d975b49d
......@@ -1358,6 +1358,8 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
boolean isShouQuanShiBai;
// 是否为终结态,是,才下一步
boolean isResultStatus = true;
// 是否经过了检查,经过检查后则不继续检查结果
boolean isShouQuanCheck = true;
for (EkpBankResultVo vo : mainList) {
seqNo = seqNoPre + System.currentTimeMillis() + (i++);
responseV1 = icbcTransactionFlowQueryService.getResultNoTax(vo, tranDate, tranTime, seqNo, client);
......@@ -1367,13 +1369,16 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
dataList = responseV1.getRd();
isShouQuanShiBai = false;
isResultStatus = true;
isShouQuanCheck = true;
if (dataList != null && !dataList.isEmpty()) {
for (MybankEnterprisePayQpayentResponseV1.MybankEnterprisePayQpayentResponseRdV1 data : dataList) {
if (CommonConstants.EIGHT_STRING.equals(data.getResult())) {
isShouQuanShiBai = true;
} else {
isShouQuanShiBai = false;
break;
if (isShouQuanCheck) {
if (CommonConstants.EIGHT_STRING.equals(data.getResult())) {
isShouQuanShiBai = true;
} else {
isShouQuanShiBai = false;
isShouQuanCheck = false;
}
}
if (!(CommonConstants.SIX_STRING.equals(data.getResult())
|| CommonConstants.SEVEN_STRING.equals(data.getResult())
......
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