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
1bb97888
Commit
1bb97888
authored
Nov 28, 2024
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.2' into MVP1.7.2
parents
3c281c01
3a72c138
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
4 deletions
+5
-4
IcbcTransactionFlowIssueController.java
...v1/ekp/controller/IcbcTransactionFlowIssueController.java
+2
-2
IcbcTransactionFlowIssueService.java
.../plus/v1/ekp/service/IcbcTransactionFlowIssueService.java
+1
-1
IcbcTransactionFlowIssueServiceImpl.java
...ekp/service/impl/IcbcTransactionFlowIssueServiceImpl.java
+2
-1
No files found.
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/controller/IcbcTransactionFlowIssueController.java
View file @
1bb97888
...
...
@@ -118,8 +118,8 @@ public class IcbcTransactionFlowIssueController {
@Operation
(
summary
=
"发放银企付款--EKP调用接口"
,
description
=
"发放银企付款--EKP调用接口"
)
@SysLog
(
"发放银企付款--EKP调用接口"
)
@GetMapping
(
"/submitBankTask"
)
public
R
<
String
>
submitBankTask
(
@RequestParam
String
fdId
,
@RequestParam
String
type
)
{
return
icbcTransactionFlowIssueService
.
submitBankTask
(
fdId
,
type
);
public
R
<
String
>
submitBankTask
(
@RequestParam
String
fdId
,
@RequestParam
String
type
,
@RequestParam
String
submitUser
)
{
return
icbcTransactionFlowIssueService
.
submitBankTask
(
fdId
,
type
,
submitUser
);
}
@Operation
(
description
=
"下载文件测试"
)
...
...
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/IcbcTransactionFlowIssueService.java
View file @
1bb97888
...
...
@@ -63,7 +63,7 @@ public interface IcbcTransactionFlowIssueService extends IService<EkpSocialInfo>
* @Date: 2024/11/22 11:32
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
R
<
String
>
submitBankTask
(
String
fdId
,
String
type
);
R
<
String
>
submitBankTask
(
String
fdId
,
String
type
,
String
submitUser
);
// 验证下载文件的正确性
void
exportAll
(
HttpServletResponse
response
);
...
...
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/IcbcTransactionFlowIssueServiceImpl.java
View file @
1bb97888
...
...
@@ -676,7 +676,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
**/
@Override
@Transactional
public
R
<
String
>
submitBankTask
(
String
fdId
,
String
type
)
{
public
R
<
String
>
submitBankTask
(
String
fdId
,
String
type
,
String
submitUser
)
{
if
(
Common
.
isNotNull
(
fdId
)
&&
Common
.
isNotNull
(
type
))
{
String
redisKey
=
"SUBMIT_BANK_"
+
fdId
;
if
(
Common
.
isNotNull
(
redisUtil
.
get
(
redisKey
)))
{
...
...
@@ -715,6 +715,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
// 发放次数+1,改主表或明细表“发放状态”为“发放中”
main
.
setFdGrantStatus
(
"发放中"
);
main
.
setFdGrantNum
(
main
.
getFdGrantNum
()
+
1
);
main
.
setFdSubmitCashier
(
submitUser
);
ekpBankPayTaskService
.
updateById
(
main
);
// 同步更新明细的发放时间、发放状态
ekpBankGrantDetailService
.
updateStatusByGrant
(
fdId
);
...
...
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