From f8c613d0d7619001860f3ec7883fe86398c59ce0 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 04 Dec 2025 18:34:23 +0800
Subject: [PATCH] 新增后台资金账户扣款

---
 trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java |   31 +++++++++++++++++++++++++++----
 1 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java
index 8e0eb85..4839c17 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java
@@ -870,7 +870,15 @@
         if(coinType.equals("usdt")){
             walletService.updateMoney("", userId, moneyRevise, new BigDecimal(0), Constants.MONEYLOG_CATEGORY_COIN
                     , coinType, accountType == 1 ? Constants.MONEYLOG_CONTENT_RECHARGE : Constants.MONEYLOG_CONTENT_WITHDRAW, "后台修改账号余额");
-        } else {
+        } else if(coinType.equals("capitaltwallet")){
+            CapitaltWallet capitaltWallet = capitaltWalletMapper.selectOne(new LambdaQueryWrapper<>(CapitaltWallet.class)
+                    .eq(CapitaltWallet::getUserId, userId).last(" limit 1 "));
+            capitaltWallet.setMoney(capitaltWallet.getMoney().add(moneyRevise));
+            if (capitaltWallet.getMoney().doubleValue() <= 0) {
+                throw new YamiShopBindException("余额不足");
+            }
+            capitaltWalletMapper.updateById(capitaltWallet);
+        }else {
             coinType = coinType+"usdt";
             WalletExtend walletExtend = new WalletExtend();
             walletExtend = walletService.saveExtendByPara(user.getUserId(), coinType);
@@ -1107,6 +1115,21 @@
             lockMoney = Double.valueOf(map.get("lockMoney").toString());
             freezeMoney = Double.valueOf(map.get("freezeMoney").toString());
             walletService.updateWithLockAndFreeze(wallet.getUserId().toString(), changeMoney, lockMoney, freezeMoney);
+        }else if("capitalusdt".equals(coinType)){
+            CapitaltWallet capitaltWallet = capitaltWalletMapper.selectOne(new LambdaQueryWrapper<>(CapitaltWallet.class)
+                    .eq(CapitaltWallet::getUserId, partyId).last(" limit 1 "));
+            amount_before = capitaltWallet.getMoney().doubleValue();
+            lock_amount_before = capitaltWallet.getLockMoney().doubleValue();
+            freeze_amount_before = capitaltWallet.getFreezeMoney().doubleValue();
+            Map<String, Object> map = checkChangeMoney(moneyRevise, resetType, amount_before, lock_amount_before, freeze_amount_before);
+            changeMoney = Double.valueOf(map.get("changeMoney").toString());
+            lockMoney = Double.valueOf(map.get("lockMoney").toString());
+            freezeMoney = Double.valueOf(map.get("freezeMoney").toString());
+
+            capitaltWallet.setMoney(new BigDecimal(Arith.add(capitaltWallet.getMoney().doubleValue(), changeMoney)));
+            capitaltWallet.setLockMoney(new BigDecimal(Arith.add(capitaltWallet.getLockMoney().doubleValue(), lockMoney)));
+            capitaltWallet.setFreezeMoney(new BigDecimal(Arith.add(capitaltWallet.getFreezeMoney().doubleValue(), freezeMoney)));
+            capitaltWalletMapper.updateById(capitaltWallet);
         } else {
             WalletExtend walletExtend = this.walletService.saveExtendByPara(partyId, coinType);
             amount_before = walletExtend.getAmount();
@@ -1300,9 +1323,9 @@
             if (user != null) {
                 throw new YamiShopBindException("账号已存在!");
             }
-            if (!isValidUsername(userName)) {
-                throw new YamiShopBindException("用户名不合法!");
-            }
+//            if (!isValidUsername(userName)) {
+//                throw new YamiShopBindException("用户名不合法!");
+//            }
             user = new User();
             user.setUserName(userName);
         }

--
Gitblit v1.9.3