Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
944931dc
Commit
944931dc
authored
Mar 09, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.20' into MVP1.7.20
parents
957edbc5
dfbad3eb
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
149 additions
and
139 deletions
+149
-139
IcbcTransactionFlowIssueServiceImpl.java
...ekp/service/impl/IcbcTransactionFlowIssueServiceImpl.java
+149
-139
No files found.
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/IcbcTransactionFlowIssueServiceImpl.java
View file @
944931dc
...
...
@@ -1349,11 +1349,15 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
// 1:获取需要查询结果的非扣税支付任务(发放中的任务)——主表
List
<
EkpBankResultVo
>
mainList
=
ekpBankPayTaskService
.
getEkpBankMainByNeedResultMain
(
typeName
);
String
statusRemark
;
// 终结态:失败6/8/41或成功7
String
failStatus
=
"41"
;
int
i
=
0
;
if
(
mainList
!=
null
&&
!
mainList
.
isEmpty
())
{
EkpBankPayTask
main
;
// 是否全部时8:授权失败,如果是,则整单失败
boolean
isShouQuanShiBai
;
// 是否为终结态,是,才下一步
boolean
isResultStatus
=
true
;
for
(
EkpBankResultVo
vo
:
mainList
)
{
seqNo
=
seqNoPre
+
System
.
currentTimeMillis
()
+
(
i
++);
responseV1
=
icbcTransactionFlowQueryService
.
getResultNoTax
(
vo
,
tranDate
,
tranTime
,
seqNo
,
client
);
...
...
@@ -1362,6 +1366,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
setIcbcLogBaseInfoNoTax
(
responseV1
,
icbcLogList
,
vo
.
getFdWxNo
(),
vo
.
getFdId
());
dataList
=
responseV1
.
getRd
();
isShouQuanShiBai
=
false
;
isResultStatus
=
true
;
if
(
dataList
!=
null
&&
!
dataList
.
isEmpty
())
{
for
(
MybankEnterprisePayQpayentResponseV1
.
MybankEnterprisePayQpayentResponseRdV1
data
:
dataList
)
{
if
(
CommonConstants
.
EIGHT_STRING
.
equals
(
data
.
getResult
()))
{
...
...
@@ -1370,8 +1375,16 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
isShouQuanShiBai
=
false
;
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,正表示业务报错,负表示系统报错
if
(
responseV1
.
isSuccess
()
&&
!
isShouQuanShiBai
)
{
// 生成日志主表
...
...
@@ -1466,6 +1479,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
}
}
}
}
if
(!
icbcLogList
.
isEmpty
())
{
ekpBankIcbcLogService
.
saveBatch
(
icbcLogList
);
}
...
...
@@ -1489,20 +1503,16 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
setIcbcLogBaseInfoNoTax
(
responseV1
,
icbcLogList
,
vo
.
getFdWxNo
(),
vo
.
getFdId
());
// 返回码,交易成功返回0,正表示业务报错,负表示系统报错
if
(
responseV1
.
isSuccess
()
&&
responseV1
.
getRd
()
!=
null
&&
!
responseV1
.
getRd
().
isEmpty
())
{
// 生成日志主表
logs
=
new
EkpBankGrantLog
();
saveNewEkpBankGrantLog
(
responseV1
.
getPackageName
(),
vo
,
vo
.
getFdId
(),
logs
,
title
);
dataList
=
responseV1
.
getRd
();
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
);
detailData
=
new
EkpBankGrantDetail
();
detailData
.
setFdId
(
vo
.
getFdId
());
//detailData.setFdSerialNumber(data.getiSeqno());
// 生成日志主表
logs
=
new
EkpBankGrantLog
();
// 失败总金额
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment