From 729a5a0592cac7750e8b476c5fcb25bfc3ff8d25 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期日, 27 七月 2025 09:06:31 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/AccountController.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/AccountController.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/AccountController.java
index fc497c8..a122797 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/AccountController.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/AccountController.java
@@ -12,7 +12,6 @@
import com.stylefeng.guns.modular.account.server.UserWithdrawalService;
import com.stylefeng.guns.modular.system.model.UserBankAccount;
import com.stylefeng.guns.modular.system.model.UserInfo;
-import com.stylefeng.guns.modular.system.model.UserWithdrawal;
import com.stylefeng.guns.modular.system.service.IUserInfoService;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import io.swagger.annotations.Api;
@@ -68,14 +67,14 @@
int count = bankAccountService.selectCount(new EntityWrapper<UserBankAccount>().eq("userId", uid)
.eq("userType", 1).eq("bankCardCode", userBankAccount.getBankCardCode())
.eq("status", 1));
- if(count > 0){
+ if (count > 0) {
return ResultUtil.error("不能重复添加银行卡");
}
- List<UserWithdrawal> userId = userWithdrawalService.selectList(new EntityWrapper<UserWithdrawal>().eq("phone", user.getPhone()).eq("userType",1));
- if(userId.size()==0){
- return ResultUtil.error("请先进行个人用户进件信息填写");
- }
+// List<UserWithdrawal> userId = userWithdrawalService.selectList(new EntityWrapper<UserWithdrawal>().eq("phone", user.getPhone()).eq("userType",1));
+// if(userId.size()==0){
+// return ResultUtil.error("请先进行个人用户进件信息填写");
+// }
userBankAccount.setUserId(uid);
UserBankAccount userBankAccount1 = new UserBankAccount();
BeanUtils.copyProperties(userBankAccount, userBankAccount1);
@@ -93,7 +92,7 @@
// userBankAccount1.setAcctValidationFailureMsg(settleAcctResp.getAcctValidationFailureMsg());
// userBankAccount1.setAcctValidationFinishedAt(settleAcctResp.getAcctValidationFinishedAt().toString());
// userBankAccount1.setSettleAcctId(settleAcctResp.getSettleAcctId());
- bankAccountService.updateById(userBankAccount1);
+// bankAccountService.updateById(userBankAccount1);
return ResultUtil.success();
}catch (Exception e){
e.printStackTrace();
--
Gitblit v1.7.1