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
6c708757
Commit
6c708757
authored
Feb 26, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.20' into MVP1.7.20
parents
7481c1a1
a5281688
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
3 deletions
+9
-3
IcbcTransactionFlowIssueServiceImpl.java
...ekp/service/impl/IcbcTransactionFlowIssueServiceImpl.java
+9
-3
No files found.
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/IcbcTransactionFlowIssueServiceImpl.java
View file @
6c708757
...
@@ -834,7 +834,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
...
@@ -834,7 +834,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
**/
**/
@Override
@Override
@Transactional
@Transactional
public
R
<
String
>
submitNoTaxTask
(
String
fdId
,
String
type
,
String
submitUser
)
{
public
synchronized
R
<
String
>
submitNoTaxTask
(
String
fdId
,
String
type
,
String
submitUser
)
{
if
(
Common
.
isNotNull
(
fdId
)
&&
Common
.
isNotNull
(
type
))
{
if
(
Common
.
isNotNull
(
fdId
)
&&
Common
.
isNotNull
(
type
))
{
String
redisKey
=
"SUBMIT_NO_TAX_BANK_"
+
fdId
;
String
redisKey
=
"SUBMIT_NO_TAX_BANK_"
+
fdId
;
if
(
Common
.
isNotNull
(
redisUtil
.
get
(
redisKey
)))
{
if
(
Common
.
isNotNull
(
redisUtil
.
get
(
redisKey
)))
{
...
@@ -864,13 +864,16 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
...
@@ -864,13 +864,16 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
String
totalAmt
=
String
.
valueOf
(
BigDecimalUtils
.
safeMultiply
(
main
.
getFdMoney
(),
new
BigDecimal
(
"100"
),
0
));
String
totalAmt
=
String
.
valueOf
(
BigDecimalUtils
.
safeMultiply
(
main
.
getFdMoney
(),
new
BigDecimal
(
"100"
),
0
));
String
totalCount
=
String
.
valueOf
(
count
);
String
totalCount
=
String
.
valueOf
(
count
);
String
wxNo
=
main
.
getFdWxNo
();
String
wxNo
=
main
.
getFdWxNo
();
if
(
Common
.
isEmpty
(
wxNo
))
{
// 为空或者失败数=-1,则生成新的wxNo
if
(
Common
.
isEmpty
(
wxNo
)
||
(
Common
.
isNotNull
(
main
.
getFdFailNum
())
&&
main
.
getFdFailNum
()
==
CommonConstants
.
ONE_INT_NEGATE
))
{
wxNo
=
"FKS"
+
new
Date
().
getTime
();
wxNo
=
"FKS"
+
new
Date
().
getTime
();
String
cur
=
ekpBankGrantDetailService
.
getWxNoByWxNo
(
wxNo
);
String
cur
=
ekpBankGrantDetailService
.
getWxNoByWxNo
(
wxNo
);
if
(
Common
.
isNotNull
(
cur
))
{
if
(
Common
.
isNotNull
(
cur
))
{
wxNo
=
"FKS"
+
new
Date
().
getTime
();
wxNo
=
"FKS"
+
new
Date
().
getTime
();
}
}
main
.
setFdWxNo
(
wxNo
);
main
.
setFdWxNo
(
wxNo
);
main
.
setFdFailNum
(
CommonConstants
.
ZERO_INT
);
// 更新wxno
// 更新wxno
ekpBankPayTaskService
.
updateById
(
main
);
ekpBankPayTaskService
.
updateById
(
main
);
}
}
...
@@ -917,7 +920,10 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
...
@@ -917,7 +920,10 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
String
totalAmt
=
String
.
valueOf
(
BigDecimalUtils
.
safeMultiply
(
detail
.
getFdMoney
(),
new
BigDecimal
(
"100"
),
0
));
String
totalAmt
=
String
.
valueOf
(
BigDecimalUtils
.
safeMultiply
(
detail
.
getFdMoney
(),
new
BigDecimal
(
"100"
),
0
));
String
totalCount
=
"1"
;
String
totalCount
=
"1"
;
String
wxNo
=
detail
.
getFdWxNo
();
String
wxNo
=
detail
.
getFdWxNo
();
if
(
Common
.
isEmpty
(
wxNo
))
{
// 为空,或失败再次发放,生成新的wxNo
if
(
Common
.
isEmpty
(
wxNo
)
||
(
Common
.
isNotNull
(
detail
.
getFdFailNum
())
&&
detail
.
getFdFailNum
()>
CommonConstants
.
ZERO_INT
&&
Common
.
isNotNull
(
detail
.
getFdGrantNum
())
&&
detail
.
getFdFailNum
()
>=
detail
.
getFdGrantNum
()))
{
wxNo
=
"FKSMX"
+
new
Date
().
getTime
();
wxNo
=
"FKSMX"
+
new
Date
().
getTime
();
String
cur
=
ekpBankGrantDetailService
.
getWxNoByWxNo
(
wxNo
);
String
cur
=
ekpBankGrantDetailService
.
getWxNoByWxNo
(
wxNo
);
if
(
Common
.
isNotNull
(
cur
))
{
if
(
Common
.
isNotNull
(
cur
))
{
...
...
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