From 5a8a43d5edb7af016b76246d9e9f661f4363342e Mon Sep 17 00:00:00 2001
From: jack <zengjieli93@163.com>
Date: Thu, 18 Apr 2024 11:13:24 +0800
Subject: [PATCH] 修改自选BUG  汇率

---
 src/main/java/com/nq/pojo/UserRecharge.java |  150 +++----------------------------------------------
 1 files changed, 10 insertions(+), 140 deletions(-)

diff --git a/src/main/java/com/nq/pojo/UserRecharge.java b/src/main/java/com/nq/pojo/UserRecharge.java
index cc58a1c..5604920 100644
--- a/src/main/java/com/nq/pojo/UserRecharge.java
+++ b/src/main/java/com/nq/pojo/UserRecharge.java
@@ -2,15 +2,21 @@
 
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.data.annotation.Transient;
 
 import java.math.BigDecimal;
 
 import java.util.Date;
 
 
+@Data
 public class UserRecharge {
 
+    @TableId(type= IdType.AUTO)
     private Integer id;
     @Excel(name = "用户id")
     private Integer userId;
@@ -25,7 +31,6 @@
     @Excel(name = "充值渠道" ,replace = { "支付宝_0", "对公打款_1" })
     private String payChannel;
 
-    private String payChannelType;
     @Excel(name = "充值金额")
     private BigDecimal payAmt;
     @Excel(name = "状态" ,replace = { "审核中_0", "成功_1", "失败_2" })
@@ -39,155 +44,20 @@
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Excel(name = "支付时间", databaseFormat = "yyyyMMddHHmmss", format = "yyyy-MM-dd HH:mm:ss")
     private Date payTime;
-
     /*支付通道主键id*/
     private Integer payId;
-
-
     /**
      * 手机号码
      * */
+    @Transient
     private String userPhone;
+    private String img;
+    private String channelName;
+    private String assetsType;
 
 
 
 
-    public UserRecharge(Integer id, Integer userId, String nickName, Integer agentId, String orderSn, String paySn, String payChannel, BigDecimal payAmt, Integer orderStatus, String orderDesc, Date addTime, Date payTime, Integer payId) {
-        this.id = id;
-        this.userId = userId;
-        this.nickName = nickName;
-        this.agentId = agentId;
-        this.orderSn = orderSn;
-        this.paySn = paySn;
-        this.payChannel = payChannel;
-        this.payAmt = payAmt;
-        this.orderStatus = orderStatus;
-        this.orderDesc = orderDesc;
-        this.addTime = addTime;
-        this.payTime = payTime;
-        this.payId = payId;
-    }
 
-    public UserRecharge() {
-    }
 
-    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 getNickName() {
-        return nickName;
-    }
-
-    public void setNickName(String nickName) {
-        this.nickName = nickName;
-    }
-
-    public Integer getAgentId() {
-        return agentId;
-    }
-
-    public void setAgentId(Integer agentId) {
-        this.agentId = agentId;
-    }
-
-    public String getOrderSn() {
-        return orderSn;
-    }
-
-    public void setOrderSn(String orderSn) {
-        this.orderSn = orderSn;
-    }
-
-    public String getPaySn() {
-        return paySn;
-    }
-
-    public void setPaySn(String paySn) {
-        this.paySn = paySn;
-    }
-
-    public String getPayChannel() {
-        return payChannel;
-    }
-
-    public void setPayChannel(String payChannel) {
-        this.payChannel = payChannel;
-    }
-
-    public BigDecimal getPayAmt() {
-        return payAmt;
-    }
-
-    public void setPayAmt(BigDecimal payAmt) {
-        this.payAmt = payAmt;
-    }
-
-    public Integer getOrderStatus() {
-        return orderStatus;
-    }
-
-    public void setOrderStatus(Integer orderStatus) {
-        this.orderStatus = orderStatus;
-    }
-
-    public String getOrderDesc() {
-        return orderDesc;
-    }
-
-    public void setOrderDesc(String orderDesc) {
-        this.orderDesc = orderDesc;
-    }
-
-    public Date getAddTime() {
-        return addTime;
-    }
-
-    public void setAddTime(Date addTime) {
-        this.addTime = addTime;
-    }
-
-    public Date getPayTime() {
-        return payTime;
-    }
-
-    public void setPayTime(Date payTime) {
-        this.payTime = payTime;
-    }
-
-    public Integer getPayId() {
-        return payId;
-    }
-
-    public void setPayId(Integer payId) {
-        this.payId = payId;
-    }
-
-    public String getPayChannelType() {
-        return payChannelType;
-    }
-
-    public void setPayChannelType(String payChannelType) {
-        this.payChannelType = payChannelType;
-    }
-
-    public String getUserPhone() {
-        return userPhone;
-    }
-
-    public void setUserPhone(String userPhone) {
-        this.userPhone = userPhone;
-    }
 }
\ No newline at end of file

--
Gitblit v1.9.3