From 7ff2bf07924915fc12612c9fd8cae5915dca2560 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 14 Oct 2025 17:28:40 +0800
Subject: [PATCH] 1

---
 trading-order-service/src/main/java/com/yami/trading/service/exchange/impl/ExchangeApplyOrderServiceImpl.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/trading-order-service/src/main/java/com/yami/trading/service/exchange/impl/ExchangeApplyOrderServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/exchange/impl/ExchangeApplyOrderServiceImpl.java
index 00ea947..a987339 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/exchange/impl/ExchangeApplyOrderServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/exchange/impl/ExchangeApplyOrderServiceImpl.java
@@ -111,11 +111,11 @@
         double amount = Arith.mul(sub, realtime.getClose().doubleValue());
         order.setCloseTime(new Date());
         order.setClosePrice(realtime.getClose().doubleValue());
-//        Wallet wallet = this.walletService.saveWalletByPartyId(order.getPartyId());
-        CapitaltWallet capitaltWallet = capitaltWalletService.getUserIdWallet(order.getPartyId());
+        Wallet capitaltWallet = this.walletService.saveWalletByPartyId(order.getPartyId());
+//        CapitaltWallet capitaltWallet = capitaltWalletService.getUserIdWallet(order.getPartyId());
         double amount_before = capitaltWallet.getMoney().doubleValue();
 //        this.walletService.update(userIdWallet.getUserId().toString(), amount);
-        this.capitaltWalletService.update(capitaltWallet, amount);
+        this.walletService.update(capitaltWallet.getUserId(), amount);
 
         /*
          * 保存资金日志
@@ -615,8 +615,8 @@
         // 可以买的数量
         double amount = Arith.div(sub, order.getClosePrice(), 8);
         order.setSymbolValue(amount);
-//        Wallet wallet = this.walletService.saveWalletByPartyId(order.getPartyId());
-        CapitaltWallet userIdWallet = capitaltWalletService.getUserIdWallet(order.getPartyId());
+        Wallet userIdWallet = this.walletService.saveWalletByPartyId(order.getPartyId());
+//        CapitaltWallet userIdWallet = capitaltWalletService.getUserIdWallet(order.getPartyId());
         double amount_before = userIdWallet.getMoney().doubleValue();
         // 如果是计划委托,则先不扣钱
         if (order.isTriggerOrder()) {
@@ -643,8 +643,8 @@
             if (userIdWallet.getMoney().doubleValue() < order.getVolume().doubleValue()) {
                 throw new YamiShopBindException("余额不足");
             }
-//            this.walletService.update(userIdWallet.getUserId().toString(), Arith.sub(0, order.getVolume()));
-            capitaltWalletService.update(userIdWallet, Arith.sub(0, order.getVolume()));
+            this.walletService.update(userIdWallet.getUserId().toString(), Arith.sub(0, order.getVolume()));
+//            capitaltWalletService.update(userIdWallet, Arith.sub(0, order.getVolume()));
             /*
              * 保存资金日志
              */

--
Gitblit v1.9.3