Commit 1bb97888 authored by fangxinjiang's avatar fangxinjiang

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

parents 3c281c01 3a72c138
...@@ -118,8 +118,8 @@ public class IcbcTransactionFlowIssueController { ...@@ -118,8 +118,8 @@ public class IcbcTransactionFlowIssueController {
@Operation(summary = "发放银企付款--EKP调用接口", description = "发放银企付款--EKP调用接口") @Operation(summary = "发放银企付款--EKP调用接口", description = "发放银企付款--EKP调用接口")
@SysLog("发放银企付款--EKP调用接口") @SysLog("发放银企付款--EKP调用接口")
@GetMapping("/submitBankTask") @GetMapping("/submitBankTask")
public R<String> submitBankTask(@RequestParam String fdId, @RequestParam String type) { public R<String> submitBankTask(@RequestParam String fdId, @RequestParam String type, @RequestParam String submitUser) {
return icbcTransactionFlowIssueService.submitBankTask(fdId, type); return icbcTransactionFlowIssueService.submitBankTask(fdId, type, submitUser);
} }
@Operation(description = "下载文件测试") @Operation(description = "下载文件测试")
......
...@@ -63,7 +63,7 @@ public interface IcbcTransactionFlowIssueService extends IService<EkpSocialInfo> ...@@ -63,7 +63,7 @@ public interface IcbcTransactionFlowIssueService extends IService<EkpSocialInfo>
* @Date: 2024/11/22 11:32 * @Date: 2024/11/22 11:32
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String> * @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); void exportAll(HttpServletResponse response);
......
...@@ -676,7 +676,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -676,7 +676,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
**/ **/
@Override @Override
@Transactional @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)) { if (Common.isNotNull(fdId) && Common.isNotNull(type)) {
String redisKey = "SUBMIT_BANK_"+fdId; String redisKey = "SUBMIT_BANK_"+fdId;
if (Common.isNotNull(redisUtil.get(redisKey))) { if (Common.isNotNull(redisUtil.get(redisKey))) {
...@@ -715,6 +715,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -715,6 +715,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
// 发放次数+1,改主表或明细表“发放状态”为“发放中” // 发放次数+1,改主表或明细表“发放状态”为“发放中”
main.setFdGrantStatus("发放中"); main.setFdGrantStatus("发放中");
main.setFdGrantNum(main.getFdGrantNum() + 1); main.setFdGrantNum(main.getFdGrantNum() + 1);
main.setFdSubmitCashier(submitUser);
ekpBankPayTaskService.updateById(main); ekpBankPayTaskService.updateById(main);
// 同步更新明细的发放时间、发放状态 // 同步更新明细的发放时间、发放状态
ekpBankGrantDetailService.updateStatusByGrant(fdId); ekpBankGrantDetailService.updateStatusByGrant(fdId);
......
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