From 92792c5583fd0e31a8da671d5dec357b82d8f0a5 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 06 Aug 2025 18:41:58 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/UserBankServiceImpl.java | 2 +-
src/main/resources/mapper/UserBankMapper.xml | 8 --------
src/main/java/com/nq/utils/SymmetricCryptoUtil.java | 2 +-
src/main/java/com/nq/dao/UserBankMapper.java | 2 --
src/main/java/com/nq/controller/protol/UserWithdrawController.java | 5 ++---
src/main/java/com/nq/pojo/UserBank.java | 4 ++++
src/main/java/com/nq/pojo/UserWithdraw.java | 6 ++++--
src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java | 3 ++-
8 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/nq/controller/protol/UserWithdrawController.java b/src/main/java/com/nq/controller/protol/UserWithdrawController.java
index fa607d8..695503d 100644
--- a/src/main/java/com/nq/controller/protol/UserWithdrawController.java
+++ b/src/main/java/com/nq/controller/protol/UserWithdrawController.java
@@ -49,7 +49,6 @@
ServerResponse serverResponse = null;
User user = this.iUserService.getCurrentRefreshUser(request);
-
String requestId = user.getId() + "_" + amt + "_" + bankId;
// 检查是否在短时间内重复请求
@@ -62,7 +61,7 @@
try {
if (!isIntegerGreaterThan100(amt)) {
- return ServerResponse.createByErrorMsg("请输入整数！",request);
+ return ServerResponse.createByErrorMsg("请输入大于10000的整数金额！",request);
}
synchronized (user.getId()){
serverResponse = this.iUserWithdrawService.outMoney(amt, user.getWithPwd(), accsetType,bankId,request);
@@ -87,7 +86,7 @@
public static boolean isIntegerGreaterThan100(String str) {
try {
int number = Integer.parseInt(str); // 尝试将字符串转换为整数
- return number > 100; // 判断是否大于100
+ return number >= 10000; // 判断是否大于100
} catch (NumberFormatException e) {
return false; // 如果转换失败，说明不是整数
}
diff --git a/src/main/java/com/nq/dao/UserBankMapper.java b/src/main/java/com/nq/dao/UserBankMapper.java
index 3847e49..35ab47a 100644
--- a/src/main/java/com/nq/dao/UserBankMapper.java
+++ b/src/main/java/com/nq/dao/UserBankMapper.java
@@ -12,8 +12,6 @@
public interface UserBankMapper extends BaseMapper<UserBank> {
int deleteByPrimaryKey(Integer paramInteger);
- int insert(UserBank paramUserBank);
-
int insertSelective(UserBank paramUserBank);
UserBank selectByPrimaryKey(Integer paramInteger);
diff --git a/src/main/java/com/nq/pojo/UserBank.java b/src/main/java/com/nq/pojo/UserBank.java
index 5bec165..1558c71 100644
--- a/src/main/java/com/nq/pojo/UserBank.java
+++ b/src/main/java/com/nq/pojo/UserBank.java
@@ -34,6 +34,10 @@
private String bankCardholderName;
// 绑定邮箱
private String bankEmail;
+ //支行名称
+ private String branchName;
+ //支行番号
+ private String branchNo;
private Date addTime = new Date();
}
\ No newline at end of file
diff --git a/src/main/java/com/nq/pojo/UserWithdraw.java b/src/main/java/com/nq/pojo/UserWithdraw.java
index 22e5f9d..c7129e4 100644
--- a/src/main/java/com/nq/pojo/UserWithdraw.java
+++ b/src/main/java/com/nq/pojo/UserWithdraw.java
@@ -5,12 +5,13 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
-
+@Data
public class UserWithdraw {
@TableId(value = "id",type = IdType.AUTO)
private Integer id;
@@ -36,7 +37,8 @@
private String bankName;
@Excel(name = "银行支行")
private String bankAddress;
-
+ @Excel(name = "支行番号")
+ private String branchNo;
@Excel(name = "状态" ,replace = { "审核中_0", "成功_1", "失败_2", "取消_3","已提交_4" })
private Integer withStatus;
@Excel(name = "手续费")
diff --git a/src/main/java/com/nq/service/impl/UserBankServiceImpl.java b/src/main/java/com/nq/service/impl/UserBankServiceImpl.java
index 899e5de..b99cf70 100644
--- a/src/main/java/com/nq/service/impl/UserBankServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserBankServiceImpl.java
@@ -63,7 +63,7 @@
if (dbBank == null) {
return ServerResponse.createByErrorMsg("修改失败。银行找不到",request );
}
- int updateCount = this.userBankMapper.updateByPrimaryKeySelective(bank);
+ int updateCount = this.userBankMapper.updateById(bank);
if (updateCount > 0) {
return ServerResponse.createBySuccess("修改银行卡成功",request );
}
diff --git a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
index 4f0fedf..eae3a1a 100644
--- a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
@@ -153,7 +153,8 @@
userWithdraw.setWithName(user.getRealName());
userWithdraw.setBankNo(userBank.getBankNo());
userWithdraw.setBankName(userBank.getBankName());
- userWithdraw.setBankAddress(userBank.getBankAddress());
+ userWithdraw.setBankAddress(userBank.getBranchName());
+ userWithdraw.setBranchNo(userBank.getBranchNo());
userWithdraw.setWithStatus(Integer.valueOf(0));
BigDecimal withfee = siteSetting.getWithFeePercent().multiply(new BigDecimal(amt)).add(new BigDecimal(siteSetting.getWithFeeSingle().intValue()));
userWithdraw.setWithFee(withfee);
diff --git a/src/main/java/com/nq/utils/SymmetricCryptoUtil.java b/src/main/java/com/nq/utils/SymmetricCryptoUtil.java
index 79b3f19..d90fcd8 100644
--- a/src/main/java/com/nq/utils/SymmetricCryptoUtil.java
+++ b/src/main/java/com/nq/utils/SymmetricCryptoUtil.java
@@ -25,7 +25,7 @@
public static void main(String[] args) {
String encryptData = encryptFromString("zdm321123.", Mode.CBC, Padding.ZeroPadding);
System.out.println("加密：" + encryptData);
- String decryptData = decryptFromString("c2l1335xRtkrWL4KVRBTHw==", Mode.CBC, Padding.ZeroPadding);
+ String decryptData = decryptFromString("rcjjhE1g+WSu+SL0EKuKQA==", Mode.CBC, Padding.ZeroPadding);
System.out.println("解密：" + decryptData);
}
diff --git a/src/main/resources/mapper/UserBankMapper.xml b/src/main/resources/mapper/UserBankMapper.xml
index 0b4c805..dd67023 100644
--- a/src/main/resources/mapper/UserBankMapper.xml
+++ b/src/main/resources/mapper/UserBankMapper.xml
@@ -26,14 +26,6 @@
delete from user_bank
where id = #{id,jdbcType=INTEGER}
</delete>
- <insert id="insert" parameterType="com.nq.pojo.UserBank" >
- insert into user_bank (id, user_id, bank_name,
- bank_no, bank_address, bank_img,
- bank_phone, bank_cardholder_name ,add_time)
- values (#{id,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{bankName,jdbcType=VARCHAR},
- #{bankNo,jdbcType=VARCHAR}, #{bankAddress,jdbcType=VARCHAR}, #{bankImg,jdbcType=VARCHAR},
- #{bankPhone,jdbcType=VARCHAR}, #{bankCardholderName},#{addTime,jdbcType=TIMESTAMP})
- </insert>
<insert id="insertSelective" parameterType="com.nq.pojo.UserBank" >
insert into user_bank
<trim prefix="(" suffix=")" suffixOverrides="," >
--
Gitblit v1.9.3