From b52ecd08ce2c34f500ec414703dfea89a4f5cf3f Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 26 Jul 2024 10:36:18 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/UserBankServiceImpl.java | 35 ++-----
src/main/resources/mapper/UserBankMapper.xml | 30 +----
src/main/java/com/nq/ws/WebsocketRunClient.java | 11 --
src/main/java/com/nq/dao/UserBankMapper.java | 5
src/main/java/com/nq/pojo/UserBank.java | 107 +++-----------------
src/main/java/com/nq/pojo/UserWithdraw.java | 4
src/main/java/com/nq/vo/user/UserBankInfoVO.java | 86 +---------------
7 files changed, 50 insertions(+), 228 deletions(-)
diff --git a/src/main/java/com/nq/dao/UserBankMapper.java b/src/main/java/com/nq/dao/UserBankMapper.java
index 6e103f6..f221213 100644
--- a/src/main/java/com/nq/dao/UserBankMapper.java
+++ b/src/main/java/com/nq/dao/UserBankMapper.java
@@ -1,12 +1,11 @@
package com.nq.dao;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nq.pojo.UserBank;
-public interface UserBankMapper {
+public interface UserBankMapper extends BaseMapper<UserBank> {
int deleteByPrimaryKey(Integer paramInteger);
-
- int insert(UserBank paramUserBank);
int insertSelective(UserBank paramUserBank);
diff --git a/src/main/java/com/nq/pojo/UserBank.java b/src/main/java/com/nq/pojo/UserBank.java
index 216a3d4..1123ba9 100644
--- a/src/main/java/com/nq/pojo/UserBank.java
+++ b/src/main/java/com/nq/pojo/UserBank.java
@@ -1,18 +1,36 @@
package com.nq.pojo;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
import java.util.Date;
-
+@Data
+@TableName("user_bank")
public class UserBank {
+ @TableId(type = IdType.AUTO,value = "id")
private Integer id;
private Integer userId;
+ //银行
private String bankName;
+ //分支
+ private String branch;
+
+ //分行号码
+ private String branchNo;
+
+ //账号
private String bankNo;
+
+ //姓名
+ private String payeeName;
/**
* 印度ifsc
@@ -29,91 +47,4 @@
private Date addTime;
-
- public UserBank(Integer id, Integer userId, String bankName, String bankNo, String bankAddress, String bankImg, String bankPhone, Date addTime) {
-
- this.id = id;
-
- this.userId = userId;
-
- this.bankName = bankName;
-
- this.bankNo = bankNo;
-
- this.bankAddress = bankAddress;
-
- this.bankImg = bankImg;
-
- this.bankPhone = bankPhone;
-
- this.addTime = addTime;
-
- }
-
- public UserBank() {
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getUserId() {
- return userId;
- }
-
- public void setUserId(Integer userId) {
- this.userId = userId;
- }
-
- public String getBankName() {
- return bankName;
- }
-
- public void setBankName(String bankName) {
- this.bankName = bankName;
- }
-
- public String getBankNo() {
- return bankNo;
- }
-
- public void setBankNo(String bankNo) {
- this.bankNo = bankNo;
- }
-
- public String getBankAddress() {
- return bankAddress;
- }
-
- public void setBankAddress(String bankAddress) {
- this.bankAddress = bankAddress;
- }
-
- public String getBankImg() {
- return bankImg;
- }
-
- public void setBankImg(String bankImg) {
- this.bankImg = bankImg;
- }
-
- public String getBankPhone() {
- return bankPhone;
- }
-
- public void setBankPhone(String bankPhone) {
- this.bankPhone = bankPhone;
- }
-
- public Date getAddTime() {
- return addTime;
- }
-
- public void setAddTime(Date addTime) {
- this.addTime = addTime;
- }
}
\ 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 bb47af4..9b27d1b 100644
--- a/src/main/java/com/nq/pojo/UserWithdraw.java
+++ b/src/main/java/com/nq/pojo/UserWithdraw.java
@@ -1,7 +1,9 @@
package com.nq.pojo;
import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
@@ -11,7 +13,7 @@
@Data
public class UserWithdraw {
-
+ @TableId(value="id",type= IdType.AUTO)
private Integer id;
@Excel(name = "用户id")
private Integer userId;
diff --git a/src/main/java/com/nq/service/impl/UserBankServiceImpl.java b/src/main/java/com/nq/service/impl/UserBankServiceImpl.java
index 5ceb463..10dc943 100644
--- a/src/main/java/com/nq/service/impl/UserBankServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserBankServiceImpl.java
@@ -43,23 +43,12 @@
if (dbBank != null) {
return ServerResponse.createByErrorMsg("银行信息已经存在。不要再加一次",request );
}
- UserBank userBank = new UserBank();
- userBank.setUserId(user.getId());
+ bank.setUserId(user.getId());
- userBank.setBankName(bank.getBankName());
+ bank.setAddTime(new Date());
- userBank.setBankNo(bank.getBankNo());
-
- userBank.setBankAddress(bank.getBankAddress());
-
- userBank.setBankImg(bank.getBankImg());
-
- userBank.setBankPhone(bank.getBankPhone());
-
- userBank.setAddTime(new Date());
-
- int insertCount = this.userBankMapper.insert(userBank);
+ int insertCount = this.userBankMapper.insert(bank);
if (insertCount > 0) {
return ServerResponse.createBySuccess("添加银行卡成功",request );
@@ -82,17 +71,7 @@
}
- dbBank.setBankName(bank.getBankName());
-
- dbBank.setBankNo(bank.getBankNo());
-
- dbBank.setBankAddress(bank.getBankAddress());
-
- dbBank.setBankImg(bank.getBankImg());
-
- dbBank.setBankPhone(bank.getBankPhone());
-
- int updateCount = this.userBankMapper.updateByPrimaryKeySelective(dbBank);
+ int updateCount = this.userBankMapper.updateById(bank);
if (updateCount > 0) {
@@ -127,6 +106,12 @@
userBankInfoVO.setBankNo(dbBank.getBankNo());
+ userBankInfoVO.setBranch(dbBank.getBranch());
+
+ userBankInfoVO.setBranchNo(dbBank.getBranchNo());
+
+ userBankInfoVO.setPayeeName(dbBank.getPayeeName());
+
return ServerResponse.createBySuccess(userBankInfoVO);
}
diff --git a/src/main/java/com/nq/vo/user/UserBankInfoVO.java b/src/main/java/com/nq/vo/user/UserBankInfoVO.java
index fcb036c..6fdae79 100644
--- a/src/main/java/com/nq/vo/user/UserBankInfoVO.java
+++ b/src/main/java/com/nq/vo/user/UserBankInfoVO.java
@@ -1,5 +1,8 @@
package com.nq.vo.user;
+import lombok.Data;
+
+@Data
public class UserBankInfoVO {
private String realName;
private String bankName;
@@ -9,83 +12,12 @@
private String bankImg;
+ //分支
+ private String branch;
+ //分行号码
+ private String branchNo;
- public void setRealName(String realName) {
- this.realName = realName;
- }
-
- public void setBankName(String bankName) {
- this.bankName = bankName;
- }
-
- public void setBankNo(String bankNo) {
- this.bankNo = bankNo;
- }
-
- public void setBankAddress(String bankAddress) {
- this.bankAddress = bankAddress;
- }
-
- public boolean equals(Object o) {
- if (o == this) return true;
- if (!(o instanceof UserBankInfoVO)) return false;
- UserBankInfoVO other = (UserBankInfoVO) o;
- if (!other.canEqual(this)) return false;
- Object this$realName = getRealName(), other$realName = other.getRealName();
- if ((this$realName == null) ? (other$realName != null) : !this$realName.equals(other$realName)) return false;
- Object this$bankName = getBankName(), other$bankName = other.getBankName();
- if ((this$bankName == null) ? (other$bankName != null) : !this$bankName.equals(other$bankName)) return false;
- Object this$bankNo = getBankNo(), other$bankNo = other.getBankNo();
- if ((this$bankNo == null) ? (other$bankNo != null) : !this$bankNo.equals(other$bankNo)) return false;
- Object this$bankAddress = getBankAddress(), other$bankAddress = other.getBankAddress();
- return !((this$bankAddress == null) ? (other$bankAddress != null) : !this$bankAddress.equals(other$bankAddress));
- }
-
- protected boolean canEqual(Object other) {
- return other instanceof UserBankInfoVO;
- }
-
- public int hashCode() {
- int PRIME = 59;
- int result = 1;
- Object $realName = getRealName();
- result = result * 59 + (($realName == null) ? 43 : $realName.hashCode());
- Object $bankName = getBankName();
- result = result * 59 + (($bankName == null) ? 43 : $bankName.hashCode());
- Object $bankNo = getBankNo();
- result = result * 59 + (($bankNo == null) ? 43 : $bankNo.hashCode());
- Object $bankAddress = getBankAddress();
- return result * 59 + (($bankAddress == null) ? 43 : $bankAddress.hashCode());
- }
-
- public String toString() {
- return "UserBankInfoVO(realName=" + getRealName() + ", bankName=" + getBankName() + ", bankNo=" + getBankNo() + ", bankAddress=" + getBankAddress() + ")";
- }
-
-
- public String getRealName() {
- return this.realName;
- }
-
- public String getBankName() {
- return this.bankName;
- }
-
- public String getBankNo() {
- return this.bankNo;
- }
-
- public String getBankAddress() {
- return this.bankAddress;
- }
-
-
- public String getBankImg() {
- return bankImg;
- }
-
- public void setBankImg(String bankImg) {
- this.bankImg = bankImg;
- }
+ //姓名
+ private String payeeName;
}
diff --git a/src/main/java/com/nq/ws/WebsocketRunClient.java b/src/main/java/com/nq/ws/WebsocketRunClient.java
index 9f2c8dd..337c169 100644
--- a/src/main/java/com/nq/ws/WebsocketRunClient.java
+++ b/src/main/java/com/nq/ws/WebsocketRunClient.java
@@ -45,16 +45,7 @@
@Override
public void onMessage(String s) {
-// Map<String, Object> map = jsonToMap(s);
- try {
- ApplicationContext act = ApplicationContextRegisterUtil.getApplicationContext();
- MandatoryLiquidationService liquidationService = (MandatoryLiquidationService) act.getBean(IMandatoryLiquidationService.class);
- StockRealTimeBean stockDetailBean = new Gson().fromJson(s, StockRealTimeBean.class);
- liquidationService.RealTimeDataProcess(eStockType,stockDetailBean);
- send(s);
- }catch (Exception e){
- e.printStackTrace();
- }
+ send(s);
}
public static Map<String, Object> jsonToMap(String json) {
diff --git a/src/main/resources/mapper/UserBankMapper.xml b/src/main/resources/mapper/UserBankMapper.xml
index f1e119b..b6bce76 100644
--- a/src/main/resources/mapper/UserBankMapper.xml
+++ b/src/main/resources/mapper/UserBankMapper.xml
@@ -1,24 +1,13 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.nq.dao.UserBankMapper" >
- <resultMap id="BaseResultMap" type="com.nq.pojo.UserBank" >
- <constructor >
- <idArg column="id" jdbcType="INTEGER" javaType="java.lang.Integer" />
- <arg column="user_id" jdbcType="INTEGER" javaType="java.lang.Integer" />
- <arg column="bank_name" jdbcType="VARCHAR" javaType="java.lang.String" />
- <arg column="bank_no" jdbcType="VARCHAR" javaType="java.lang.String" />
- <arg column="bank_address" jdbcType="VARCHAR" javaType="java.lang.String" />
- <arg column="bank_img" jdbcType="VARCHAR" javaType="java.lang.String" />
- <arg column="bank_phone" jdbcType="VARCHAR" javaType="java.lang.String" />
- <arg column="add_time" jdbcType="TIMESTAMP" javaType="java.util.Date" />
- </constructor>
- </resultMap>
+
<sql id="Base_Column_List" >
id, user_id, bank_name, bank_no, bank_address, bank_img, bank_phone, add_time
</sql>
- <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+ <select id="selectByPrimaryKey" resultType="com.nq.pojo.UserBank" parameterType="java.lang.Integer" >
select
- <include refid="Base_Column_List" />
+ *
from user_bank
where id = #{id,jdbcType=INTEGER}
</select>
@@ -26,14 +15,7 @@
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, add_time)
- values (#{id,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{bankName,jdbcType=VARCHAR},
- #{bankNo,jdbcType=VARCHAR}, #{bankAddress,jdbcType=VARCHAR}, #{bankImg,jdbcType=VARCHAR},
- #{bankPhone,jdbcType=VARCHAR}, #{addTime,jdbcType=TIMESTAMP})
- </insert>
+
<insert id="insertSelective" parameterType="com.nq.pojo.UserBank" >
insert into user_bank
<trim prefix="(" suffix=")" suffixOverrides="," >
@@ -131,9 +113,9 @@
- <select id="findUserBankByUserId" parameterType="integer" resultMap="BaseResultMap">
+ <select id="findUserBankByUserId" parameterType="integer" resultType="com.nq.pojo.UserBank">
SELECT
- <include refid="Base_Column_List"/>
+ *
FROM user_bank
WHERE user_id = #{userId}
limit 1
--
Gitblit v1.9.3