From f1673d496ad22f20c7b2f04bd98f916c841c5f5f Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Thu, 09 Oct 2025 11:23:43 +0800
Subject: [PATCH] 后台资金显示
---
trading-order-bean/src/main/java/com/yami/trading/bean/user/dto/UserDto.java | 3 +++
trading-order-service/src/main/java/com/yami/trading/service/impl/CapitaltWalletServiceImpl.java | 18 +++++++++++-------
trading-order-service/src/main/resources/mapper/UserMapper.xml | 4 +++-
3 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/trading-order-bean/src/main/java/com/yami/trading/bean/user/dto/UserDto.java b/trading-order-bean/src/main/java/com/yami/trading/bean/user/dto/UserDto.java
index e96c2b9..0318658 100644
--- a/trading-order-bean/src/main/java/com/yami/trading/bean/user/dto/UserDto.java
+++ b/trading-order-bean/src/main/java/com/yami/trading/bean/user/dto/UserDto.java
@@ -27,6 +27,9 @@
*/
@ApiModelProperty("USDT账户余额")
private BigDecimal money;
+
+ @ApiModelProperty("USDT账户资金余额")
+ private BigDecimal capitalMoney;
/**
* 账户类型
*/
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/impl/CapitaltWalletServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/impl/CapitaltWalletServiceImpl.java
index e66fa9d..5539802 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/impl/CapitaltWalletServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/impl/CapitaltWalletServiceImpl.java
@@ -55,8 +55,16 @@
@Override
public CapitaltWallet getUserIdWallet(String userId) {
- return getOne(new LambdaQueryWrapper<>(CapitaltWallet.class)
+ CapitaltWallet capitaltWallet = getOne(new LambdaQueryWrapper<>(CapitaltWallet.class)
.eq(CapitaltWallet::getUserId,userId).last(" limit 1"));
+ if (capitaltWallet != null) {
+ return capitaltWallet;
+ } else {
+ capitaltWallet = new CapitaltWallet();
+ capitaltWallet.setUserId(userId);
+ save(capitaltWallet);
+ return capitaltWallet;
+ }
}
/**
@@ -136,13 +144,9 @@
}
if ("usdt".equals(coinType)) {
double amount1 = moneyRevise.doubleValue();
- CapitaltWallet capitaltWallet = getOne(new LambdaQueryWrapper<>(CapitaltWallet.class)
- .eq(CapitaltWallet::getUserId, userId).last(" limit 1 "));
+ CapitaltWallet capitaltWallet = getUserIdWallet(userId);
if (capitaltWallet == null) {
- capitaltWallet = new CapitaltWallet();
- capitaltWallet.setUserId(userId);
- capitaltWalletMapper.insert(capitaltWallet);
- throw new YamiShopBindException("请重试");
+ throw new YamiShopBindException("账号缺少资金数据");
}
double amount_before = capitaltWallet.getMoney().doubleValue();
if (accountType == 2 && capitaltWallet.getMoney().subtract(moneyRevise).compareTo(BigDecimal.ZERO) < 0) {
diff --git a/trading-order-service/src/main/resources/mapper/UserMapper.xml b/trading-order-service/src/main/resources/mapper/UserMapper.xml
index 4414f22..90c8059 100644
--- a/trading-order-service/src/main/resources/mapper/UserMapper.xml
+++ b/trading-order-service/src/main/resources/mapper/UserMapper.xml
@@ -38,7 +38,9 @@
<select id="listUser" resultType="com.yami.trading.bean.user.dto.UserDto">
- SELECT * FROM tz_user u LEFT JOIN tz_wallet w ON u.user_id=w.user_id
+ SELECT u.*,w.money,c.money capital_money FROM tz_user u
+ LEFT JOIN tz_wallet w ON u.user_id=w.user_id
+ LEFT JOIN tz_capital_wallet c ON u.user_id=c.user_id
where 1=1 and u.role_name in
<foreach collection="roleNames" separator="," index="index" open="(" close=")" item="r">
--
Gitblit v1.9.3