From f658569891db433854221b80f0a9fa99608cff64 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 03 Apr 2026 18:22:34 +0800
Subject: [PATCH] 1
---
trading-order-service/src/main/java/com/yami/trading/service/impl/FollowWalletServiceImpl.java | 20 ++------------------
1 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/impl/FollowWalletServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/impl/FollowWalletServiceImpl.java
index c346e42..4a68115 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/impl/FollowWalletServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/impl/FollowWalletServiceImpl.java
@@ -256,16 +256,7 @@
}
}
- // 真正下单里
- double order_volume = 1;
-
- if (order.getLeverRate() != null && order.getLeverRate().compareTo(BigDecimal.ZERO) != 0) {
- order_volume = order.getVolumeOpen().divide(order.getLeverRate(), 6, RoundingMode.FLOOR).doubleValue();
- } else {
- order_volume = order.getVolumeOpen().doubleValue();
- }
-
- double amount = Arith.add(Arith.mul(order_volume, order.getUnitAmount().doubleValue()), order.getProfit().doubleValue());
+ double amount = order.getDeposit().add(order.getProfit()).doubleValue();
money_contract = Arith.add(amount, money_contract);
money_contract_deposit = Arith.add(order.getDeposit().doubleValue(), money_contract_deposit);
money_contract_profit = Arith.add(order.getProfit().doubleValue(), money_contract_profit);
@@ -780,14 +771,7 @@
return moneysContract;
}
ApplicationUtil.getBean(ContractOrderService.class).wrapProfit(order);
- BigDecimal orderVolume = BigDecimal.ONE;
-
- if (order.getLeverRate() != null && order.getLeverRate().compareTo(BigDecimal.ZERO) != 0) {
- orderVolume = order.getVolumeOpen().divide(order.getLeverRate(), 2, RoundingMode.FLOOR);
- } else {
- orderVolume = order.getVolumeOpen();
- }
- BigDecimal moneyContract = orderVolume.multiply(order.getUnitAmount()).add(order.getProfit());
+ BigDecimal moneyContract = order.getDeposit().add(order.getProfit());
BigDecimal moneyContractDeposit = order.getDeposit();
BigDecimal moneyContractProfit = order.getProfit();
--
Gitblit v1.9.3