From 5bfeca1cc5b5263e17c068ca12fbaab1d51917f4 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 22 Oct 2025 13:37:35 +0800
Subject: [PATCH] 1
---
trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderService.java | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 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 15228c1..d237d89 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
@@ -280,7 +280,6 @@
BigDecimal profit = settle(order, order.getVolume());
Wallet wallet = walletService.findByUserId(order.getPartyId());
-
if (wallet.getMoney().add(profit).compareTo(BigDecimal.ZERO) < 0) {
// 如果结果是负数，就归零
if (wallet.getMoney().compareTo(BigDecimal.ZERO) < 0) {
@@ -565,12 +564,14 @@
f.setTradeAvgPrice((f.getTradeAvgPrice().add(realtime.getClose())).divide(new BigDecimal(2)).setScale(4, RoundingMode.DOWN));
BigDecimal fee = BigDecimal.ZERO;
- if (f.getLeverRate() != null) {
-
- fee = applyOrder.getDeposit().multiply(f.getLeverRate()).multiply(item.getUnitFee());
- fee = fee.setScale(4, RoundingMode.DOWN); // 保留两位小数
- f.setFee(f.getFee().add(fee));
- }
+// if (f.getLeverRate() != null) {
+//
+// fee = applyOrder.getDeposit().multiply(f.getLeverRate()).multiply(item.getUnitFee());
+// fee = fee.setScale(4, RoundingMode.DOWN); // 保留两位小数
+// f.setFee(f.getFee().add(fee));
+// }
+ fee = applyOrder.getFee();
+ f.setFee(applyOrder.getFee());
double number = strongLevelCalculationService.countSheets(f.getDepositOpen().doubleValue(), applyOrder.getLeverRate().intValue(), 0.01, realtime.getClose().doubleValue());
f.setVolumeOpen(new BigDecimal(number));
f.setVolume(new BigDecimal(number));
@@ -598,11 +599,12 @@
order.setDepositOpen(applyOrder.getMoney());
order.setDeposit(applyOrder.getMoney());
- if (order.getLeverRate() != null) {
- BigDecimal fee = order.getDeposit().multiply(order.getLeverRate()).multiply(item.getUnitFee());
- fee = fee.setScale(4, RoundingMode.DOWN); // 保留两位小数
- order.setFee(fee);
- }
+// if (order.getLeverRate() != null) {
+// BigDecimal fee = order.getDeposit().multiply(order.getLeverRate()).multiply(item.getUnitFee());
+// fee = fee.setScale(4, RoundingMode.DOWN); // 保留两位小数
+// order.setFee(fee);
+// }
+ order.setFee(applyOrder.getFee());
double number = strongLevelCalculationService.countSheets(order.getDepositOpen().doubleValue(), order.getLeverRate().intValue(), 0.01, applyOrder.getPrice().doubleValue());
order.setVolume(new BigDecimal(number));
order.setVolumeOpen(new BigDecimal(number));
@@ -817,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());
}
@@ -857,4 +859,12 @@
RedisUtil.del(ContractRedisKeys.CONTRACT_ASSETS_PROFIT_PARTY_ID + partyId);
}
}
+
+ public void updateLave(ContractOrder order, BigDecimal leverRate) {
+ double number = strongLevelCalculationService.countSheets(order.getDepositOpen().doubleValue(), leverRate.intValue(), 0.01, order.getTradeAvgPrice().doubleValue());
+ order.setVolumeOpen(new BigDecimal(number));
+ order.setVolume(new BigDecimal(number));
+ order.setLeverRate(leverRate);
+ update(order);
+ }
}
--
Gitblit v1.9.3