From 96106139019751f4a45d957ff6969f428d602d42 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Fri, 27 Feb 2026 18:39:09 +0800
Subject: [PATCH] 合约
---
trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderService.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 5739e26..a895cd0 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
@@ -528,7 +528,7 @@
if(null != order.getProfitLossRatio() || order.getProfitLossRatio() > 0){
profit = order.getDepositOpen().multiply(new BigDecimal((order.getProfitLossRatio()/100))).setScale(2, RoundingMode.DOWN);
}
- BigDecimal rentalProfit = order.getDeposit().add(profit);
+ BigDecimal rentalProfit = order.getDeposit().add(profit).add(order.getAddDepositOpen());
BigDecimal rate = volume.divide(order.getVolumeOpen(), 2, RoundingMode.HALF_UP);
order.setAmountClose(order.getAmountClose().add(profit));
order.setVolume(order.getVolume().subtract(volume));
@@ -697,7 +697,7 @@
Map<String, Object> moneyAll = walletService.getMoneyAll(order.getPartyId());
earnings = order.getDepositOpen().add(new BigDecimal(moneyAll.get("money_all_coin").toString()));
}else{
- earnings = order.getDepositOpen();
+ earnings = order.getDepositOpen().add(order.getAddDepositOpen());
}
double faceValue = 0.01; // 合约面值（固定面值不能调整）
double maintenanceMarginRate = 0.004; // 维持保证金率（固定不变）
@@ -819,10 +819,10 @@
map.put("fee", order.getFee());
map.put("deposit", order.getDeposit());
map.put("deposit_open", order.getDepositOpen());
- map.put("change_ratio", order.getChangeRatio());
+ map.put("change_ratio", order.getChangeRatio().setScale(2, RoundingMode.HALF_UP));
if(order.getProfit()!=null){
- map.put("profit", order.getProfit().setScale(4, RoundingMode.HALF_UP));
+ map.put("profit", order.getProfit().setScale(2, RoundingMode.HALF_UP));
}else{
map.put("profit", order.getProfit());
}
--
Gitblit v1.9.3