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
d207cdae
Commit
d207cdae
authored
Mar 26, 2026
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.7.21-四大报销银企
parent
40f81e6a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
8 deletions
+17
-8
EkpBankResultVo.java
...n/java/com/yifu/cloud/plus/v1/ekp/vo/EkpBankResultVo.java
+2
-0
IcbcTransactionFlowIssueServiceImpl.java
...ekp/service/impl/IcbcTransactionFlowIssueServiceImpl.java
+13
-6
EkpBankPayTaskMapper.xml
...kp-biz/src/main/resources/mapper/EkpBankPayTaskMapper.xml
+2
-2
No files found.
yifu-ekp/yifu-ekp-api/src/main/java/com/yifu/cloud/plus/v1/ekp/vo/EkpBankResultVo.java
View file @
d207cdae
...
...
@@ -38,4 +38,6 @@ public class EkpBankResultVo implements Serializable {
private
String
fdAttaSrc
;
// 非扣税使用的金额,授权失败记录金额
private
String
fdMoney
;
// 汇款用途,如果是非扣税,就是转账,如果是报销,就是报销
private
String
fdPayType
;
}
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/IcbcTransactionFlowIssueServiceImpl.java
View file @
d207cdae
...
...
@@ -1399,6 +1399,10 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
// 是否经过了检查,经过检查后则不继续检查结果
boolean
isShouQuanCheck
=
true
;
for
(
EkpBankResultVo
vo
:
mainList
)
{
if
(
Common
.
isNotNull
(
vo
.
getFdPayType
())
&&
"报销"
.
equals
(
vo
.
getFdPayType
()))
{
title
=
vo
.
getFdPayType
();
}
seqNo
=
seqNoPre
+
System
.
currentTimeMillis
()
+
(
i
++);
responseV1
=
icbcTransactionFlowQueryService
.
getResultNoTax
(
vo
,
tranDate
,
tranTime
,
seqNo
,
client
);
if
(
Common
.
isNotNull
(
responseV1
))
{
...
...
@@ -1465,7 +1469,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
moneyAll
=
BigDecimalUtils
.
safeAdd
(
moneyAll
,
money
);
// 初始化日志明细
logDetail
=
new
EkpBankGrantLogDetail
();
setLogDetailBaseInfoNoTax
(
logs
,
money
,
logDetail
,
data
);
setLogDetailBaseInfoNoTax
(
logs
,
money
,
logDetail
,
data
,
title
);
if
(
Common
.
isNotNull
(
data
.
getUniBusiId
()))
{
detailData
=
oldMap
.
get
(
data
.
getUniBusiId
());
...
...
@@ -1545,6 +1549,9 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
// 初始化
i
=
0
;
for
(
EkpBankResultVo
vo
:
detailList
)
{
if
(
Common
.
isNotNull
(
vo
.
getFdPayType
())
&&
"报销"
.
equals
(
vo
.
getFdPayType
()))
{
title
=
vo
.
getFdPayType
();
}
seqNo
=
seqNoPre
+
System
.
currentTimeMillis
()
+
(
i
++);
responseV1
=
icbcTransactionFlowQueryService
.
getResultNoTax
(
vo
,
tranDate
,
tranTime
,
seqNo
,
client
);
...
...
@@ -1602,7 +1609,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
saveNewEkpBankGrantLog
(
responseV1
.
getPackageName
(),
vo
,
vo
.
getFdParentId
(),
logs
,
title
);
// 初始化日志明细
logDetail
=
new
EkpBankGrantLogDetail
();
setLogDetailBaseInfoNoTax
(
logs
,
money
,
logDetail
,
data
);
setLogDetailBaseInfoNoTax
(
logs
,
money
,
logDetail
,
data
,
title
);
// 收款人名称
logDetail
.
setFdPayee
(
vo
.
getFdPayeeName
());
logDetail
.
setFdRecipientBank
(
vo
.
getFdRecipientBank
());
...
...
@@ -1640,7 +1647,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
saveNewEkpBankGrantLog
(
responseV1
.
getPackageName
(),
vo
,
vo
.
getFdParentId
(),
logs
,
title
);
// 初始化日志明细
logDetail
=
new
EkpBankGrantLogDetail
();
setLogDetailBaseInfoNoTax
(
logs
,
money
,
logDetail
,
null
);
setLogDetailBaseInfoNoTax
(
logs
,
money
,
logDetail
,
null
,
title
);
// 收款人名称
logDetail
.
setFdPayee
(
vo
.
getFdPayeeName
());
logDetail
.
setFdRecipientBank
(
vo
.
getFdRecipientBank
());
...
...
@@ -2194,7 +2201,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
}
private
void
setLogDetailBaseInfoNoTax
(
EkpBankGrantLog
logs
,
BigDecimal
money
,
EkpBankGrantLogDetail
logDetail
,
MybankEnterprisePayQpayentResponseV1
.
MybankEnterprisePayQpayentResponseRdV1
data
)
{
,
MybankEnterprisePayQpayentResponseV1
.
MybankEnterprisePayQpayentResponseRdV1
data
,
String
title
)
{
logDetail
.
setFdParentId
(
logs
.
getFdId
());
logDetail
.
setFdMoney
(
money
);
...
...
@@ -2205,8 +2212,8 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
logDetail
.
setFdPayeeAccount
(
data
.
getRecAccNo
());
logDetail
.
setFdRemark
(
data
.
getSummary
());
}
// 汇款用途
logDetail
.
setFdRemittancePurpose
(
"转账"
);
// 汇款用途
:工资、转账、报销
logDetail
.
setFdRemittancePurpose
(
title
);
}
/**
...
...
yifu-ekp/yifu-ekp-biz/src/main/resources/mapper/EkpBankPayTaskMapper.xml
View file @
d207cdae
...
...
@@ -110,7 +110,7 @@
<select
id=
"getEkpBankMainByNeedResultMainByOther"
resultType=
"com.yifu.cloud.plus.v1.ekp.vo.EkpBankResultVo"
>
select a.fd_id fdId,a.fd_wx_no fdWxNo
,count(d.fd_id) num,a.fd_bank_name fdBankName,a.fd_bank_no fdBankNo,a.fd_bank_account fdBankAccount
,a.fd_grant_num fdGrantNum,a.fd_atta_src fdAttaSrc
,a.fd_grant_num fdGrantNum,a.fd_atta_src fdAttaSrc
,a.fd_pay_type fdPayType
from ekp_bank_pay_task a left join ekp_bank_grant_detail d on a.fd_id = d.fd_parent_id
where a.fd_grant_status = '发放中' and a.fd_pay_type in ("非扣税","报销")
GROUP BY a.fd_id
...
...
@@ -120,7 +120,7 @@
<select
id=
"getEkpBankMainByNeedResultDetailByOther"
resultType=
"com.yifu.cloud.plus.v1.ekp.vo.EkpBankResultVo"
>
select d.fd_id fdId,d.fd_wx_no fdWxNo,d.fd_parent_id fdParentId,d.fd_fail_num fdFailNum,d.fd_salary_id fdSalaryId
,'1' num,a.fd_bank_name fdBankName,a.fd_bank_no fdBankNo,a.fd_bank_account fdBankAccount,d.fd_payee_name fdPayeeName
,d.fd_grant_num fdGrantNum,d.fd_recipient_bank fdRecipientBank,d.fd_atta_src fdAttaSrc,d.fd_money fdMoney
,d.fd_grant_num fdGrantNum,d.fd_recipient_bank fdRecipientBank,d.fd_atta_src fdAttaSrc,d.fd_money fdMoney
,a.fd_pay_type fdPayType
from ekp_bank_grant_detail d left join ekp_bank_pay_task a on a.fd_id = d.fd_parent_id
where a.fd_grant_status = '已发放' and d.fd_grant_status = '发放失败' and d.fd_handle_status = '发放中' and a.fd_pay_type in ("非扣税","报销")
</select>
...
...
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