From 6fd35ed620c5cc01a69d72b9d4d0e93703638847 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Thu, 05 Mar 2026 17:00:12 +0800
Subject: [PATCH] 全仓

---
 trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderService.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderService.java b/trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderService.java
index d11bea5..82a5529 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderService.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderService.java
@@ -698,8 +698,10 @@
         BigDecimal earnings = BigDecimal.ZERO;
         if(order.getLocationType() == 1){//全仓
             // 获取当前账户余额并加到收益中
-            Map<String, Object> moneyAll = walletService.getMoneyAll(order.getPartyId());
-            earnings = order.getDepositOpen().add(new BigDecimal(moneyAll.get("money_all_coin").toString()));
+            //Map<String, Object> moneyAll = walletService.getMoneyAll(order.getPartyId());
+            //earnings = order.getDepositOpen().add(new BigDecimal(moneyAll.get("money_wallet").toString()));
+            Wallet wallet = walletService.saveWalletByPartyId(order.getPartyId());
+            earnings = order.getDepositOpen().add(earnings.add(wallet.getMoney()));
         }else{
             earnings = order.getDepositOpen().add(order.getAddDepositOpen());
         }

--
Gitblit v1.9.3