From 7b44e1c44978ca08aeab9e92560e75793e73583c Mon Sep 17 00:00:00 2001
From: peter <14100000001@qq.com>
Date: Mon, 04 Aug 2025 17:50:57 +0800
Subject: [PATCH] 修改

---
 trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiWalletController.java |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiWalletController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiWalletController.java
index 658d71a..b9a9916 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiWalletController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiWalletController.java
@@ -7,6 +7,7 @@
 import com.yami.trading.api.service.UserCacheService;
 import com.yami.trading.bean.data.domain.Realtime;
 import com.yami.trading.bean.item.domain.Item;
+import com.yami.trading.bean.model.CapitaltWallet;
 import com.yami.trading.bean.model.ChannelBlockchain;
 import com.yami.trading.bean.model.Wallet;
 import com.yami.trading.bean.model.WalletExtend;
@@ -18,10 +19,7 @@
 import com.yami.trading.common.util.HttpContextUtils;
 import com.yami.trading.common.util.StringUtils;
 import com.yami.trading.security.common.util.SecurityUtils;
-import com.yami.trading.service.ChannelBlockchainService;
-import com.yami.trading.service.RechargeBlockchainOrderService;
-import com.yami.trading.service.WalletService;
-import com.yami.trading.service.WithdrawService;
+import com.yami.trading.service.*;
 import com.yami.trading.service.data.DataService;
 import com.yami.trading.service.item.ItemService;
 import com.yami.trading.service.syspara.SysparaService;
@@ -71,6 +69,8 @@
     ItemService itemService;
     @Autowired
     WalletLogService walletLogService;
+    @Autowired
+    CapitaltWalletService capitaltWalletService;
 
     @GetMapping("/getUsdt")
     @ApiOperation(value = "获取usdt余额")
@@ -215,12 +215,13 @@
         df2.setRoundingMode(RoundingMode.FLOOR);
         // String partyId ="dcc0dd35a49c383dadabc4dc030afe70";
         String partyId = SecurityUtils.getCurrentUserId();
-        Wallet usdt = null;
+        CapitaltWallet usdt = null;
         if (StringUtils.isNotEmpty(partyId)) {
-            usdt = this.walletService.saveWalletByPartyId(partyId);
+//            usdt = this.walletService.saveWalletByPartyId(partyId);
+            usdt = capitaltWalletService.getUserIdWallet(partyId);
         }
         if (null == usdt) {
-            usdt = new Wallet();
+            usdt = new CapitaltWallet();
             usdt.setMoney(new BigDecimal(0));
             usdt.setLockMoney(new BigDecimal(0));
             usdt.setFreezeMoney(new BigDecimal(0));

--
Gitblit v1.9.3