From c51c656bb90a3b6b644a688d3b7bffc8cdf48379 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Wed, 13 Aug 2025 15:43:05 +0800
Subject: [PATCH] app充值列表,提现修改
---
src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java | 12 +++
src/main/java/com/nq/pojo/UserWithdraw.java | 159 +---------------------------------------------------
src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java | 1
3 files changed, 15 insertions(+), 157 deletions(-)
diff --git a/src/main/java/com/nq/pojo/UserWithdraw.java b/src/main/java/com/nq/pojo/UserWithdraw.java
index e0c3a18..fe027bb 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;
@@ -46,159 +47,7 @@
@TableField(exist = false)
private String userPhone;
+ @Excel(name = "提现账户类型")
+ private String accsetType;
- public UserWithdraw(Integer id, Integer userId, String nickName, Integer agentId, BigDecimal withAmt, Date applyTime, Date transTime, String withName, String bankNo, String bankName, String bankAddress, Integer withStatus, BigDecimal withFee, String withMsg) {
-
- this.id = id;
-
- this.userId = userId;
-
- this.nickName = nickName;
-
- this.agentId = agentId;
-
- this.withAmt = withAmt;
-
- this.applyTime = applyTime;
-
- this.transTime = transTime;
-
- this.withName = withName;
-
- this.bankNo = bankNo;
-
- this.bankName = bankName;
-
- this.bankAddress = bankAddress;
-
- this.withStatus = withStatus;
-
- this.withFee = withFee;
-
- this.withMsg = withMsg;
-
- }
-
- public UserWithdraw() {
- }
-
- 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 BigDecimal getWithAmt() {
- return withAmt;
- }
-
- public void setWithAmt(BigDecimal withAmt) {
- this.withAmt = withAmt;
- }
-
- public Date getApplyTime() {
- return applyTime;
- }
-
- public void setApplyTime(Date applyTime) {
- this.applyTime = applyTime;
- }
-
- public Date getTransTime() {
- return transTime;
- }
-
- public void setTransTime(Date transTime) {
- this.transTime = transTime;
- }
-
- public String getWithName() {
- return withName;
- }
-
- public void setWithName(String withName) {
- this.withName = withName;
- }
-
- public String getBankNo() {
- return bankNo;
- }
-
- public void setBankNo(String bankNo) {
- this.bankNo = bankNo;
- }
-
- public String getBankName() {
- return bankName;
- }
-
- public void setBankName(String bankName) {
- this.bankName = bankName;
- }
-
- public String getBankAddress() {
- return bankAddress;
- }
-
- public void setBankAddress(String bankAddress) {
- this.bankAddress = bankAddress;
- }
-
- public Integer getWithStatus() {
- return withStatus;
- }
-
- public void setWithStatus(Integer withStatus) {
- this.withStatus = withStatus;
- }
-
- public BigDecimal getWithFee() {
- return withFee;
- }
-
- public void setWithFee(BigDecimal withFee) {
- this.withFee = withFee;
- }
-
- public String getWithMsg() {
- return withMsg;
- }
-
- public void setWithMsg(String withMsg) {
- this.withMsg = withMsg;
- }
-
- public String getUserPhone() {
- return userPhone;
- }
-
- public void setUserPhone(String userPhone) {
- this.userPhone = userPhone;
- }
}
\ No newline at end of file
diff --git a/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java b/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
index 1738b98..cd8100a 100644
--- a/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
@@ -218,8 +218,15 @@
for (int i = 0; i <userRecharges.size() ; i++) {
//SitePay s = sitePayMapper.selectById(userRecharges.get(i).getPayId());
- userRecharges.get(i).setAssetsType(EStockType.getDefault().getSymbol1());
- userRecharges.get(i).setChannelName(EStockType.getDefault().getSymbol());
+ if (StringUtils.isNotBlank(userRecharges.get(i).getAssetsType())) {
+ EStockType eStockType = EStockType.getEStockTypeByCode(userRecharges.get(i).getAssetsType());
+ userRecharges.get(i).setAssetsType(eStockType.getSymbol1());
+ userRecharges.get(i).setChannelName(eStockType.getSymbol());
+ } else {
+ userRecharges.get(i).setAssetsType(EStockType.getDefault().getSymbol1());
+ userRecharges.get(i).setChannelName(EStockType.getDefault().getSymbol());
+ }
+
}
return ServerResponse.createBySuccess(pageInfo);
@@ -342,6 +349,7 @@
userRecharge.setPayTime(new Date());
userRecharge.setOrderStatus(Integer.valueOf(1));
userRecharge.setPayId(1);
+ userRecharge.setAssetsType(accectType);
userAssetsServices.availablebalanceChange(accectType,
userId,EUserAssets.TOP_UP,new BigDecimal(amt),"","");
int insertCount = this.userRechargeMapper.insert(userRecharge);
diff --git a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
index a81175e..0f5990c 100644
--- a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
@@ -133,6 +133,7 @@
userWithdraw.setWithStatus(Integer.valueOf(0));
BigDecimal withfee = siteSetting.getWithFeePercent().multiply(new BigDecimal(amt)).add(new BigDecimal(siteSetting.getWithFeeSingle().intValue()));
userWithdraw.setWithFee(withfee);
+ userWithdraw.setAccsetType(accsetType);
int insertCount = this.userWithdrawMapper.insert(userWithdraw);
if (insertCount > 0) {
return ServerResponse.createBySuccessMsg("提现成功",request);
--
Gitblit v1.9.3