From cb490e56ee7bccbc3b56d6964e9b68e5aa8ec475 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期一, 16 十二月 2024 17:16:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserBankController.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserBankController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserBankController.java
index 1fb8829..e242c63 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserBankController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserBankController.java
@@ -1,5 +1,6 @@
package com.ruoyi.account.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.account.api.model.AppUserBank;
import com.ruoyi.account.service.AppUserBankService;
import com.ruoyi.common.core.utils.bean.BeanUtils;
@@ -34,8 +35,17 @@
@ApiOperation(value = "保存银行卡")
public AjaxResult saveAppUserBank(@RequestBody AppUserBank appUserBank){
LoginUser loginUserApplet = tokenService.getLoginUserApplet();
- appUserBank.setAppUserId(loginUserApplet.getUserid());
- appUserBankService.saveOrUpdate(appUserBank);
+
+ AppUserBank bank = appUserBankService.getOne(new LambdaQueryWrapper<AppUserBank>()
+ .eq(AppUserBank::getAppUserId, loginUserApplet.getUserid()));
+ if (bank == null){
+ appUserBank.setAppUserId(loginUserApplet.getUserid());
+ appUserBankService.saveOrUpdate(appUserBank);
+ }else {
+ appUserBank.setId(bank.getId());
+ appUserBank.setAppUserId(bank.getAppUserId());
+ appUserBankService.updateById(appUserBank);
+ }
return AjaxResult.success();
}
@@ -45,8 +55,9 @@
@ApiOperation(value = "获取银行卡信息")
public AjaxResult<AppUserBank> getAppUserBank(){
LoginUser loginUserApplet = tokenService.getLoginUserApplet();
- AppUserBank bank = appUserBankService.getById(loginUserApplet.getUserid());
- return AjaxResult.success(bank);
+ AppUserBank appUserBank = appUserBankService.getOne(new LambdaQueryWrapper<AppUserBank>()
+ .eq(AppUserBank::getAppUserId, loginUserApplet.getUserid()));
+ return AjaxResult.success(appUserBank);
}
}
--
Gitblit v1.7.1