From 6a4535b1e7541156f4c3c899bd7370eec79f0dee Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 15 Oct 2025 19:05:50 +0800
Subject: [PATCH] 1
---
trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderService.java | 54 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 36 insertions(+), 18 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 e3d5cc6..5657f97 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) {
@@ -526,6 +525,9 @@
BigDecimal close = realtime.getClose();
BigDecimal point = close.subtract(order.getTradeAvgPrice());
BigDecimal profit = point.multiply(new BigDecimal("0.01")).multiply(order.getVolumeOpen()).setScale(4, BigDecimal.ROUND_DOWN);;
+ 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 rate = volume.divide(order.getVolumeOpen(), 2, RoundingMode.HALF_UP);
order.setAmountClose(order.getAmountClose().add(profit));
@@ -565,12 +567,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 +602,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));
@@ -689,9 +694,14 @@
}
private void getStrongPrice(ContractOrder order, Item item) {
- // 获取当前账户余额并加到收益中
- Map<String, Object> moneyAll = walletService.getMoneyAll(order.getPartyId());
- BigDecimal earnings = order.getDepositOpen().add(new BigDecimal(moneyAll.get("money_all_coin").toString()));
+ 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()));
+ }else{
+ earnings = order.getDepositOpen();
+ }
double faceValue = 0.01; // 合约面值（固定面值不能调整）
double maintenanceMarginRate = 0.004; // 维持保证金率（固定不变）
//"buy":买(多) "sell":卖(空)
@@ -777,7 +787,7 @@
}
map.put("name", name);
map.put("symbol", order.getSymbol());
- map.put("create_time", DateUtils.format(order.getCreateTime(), DateUtils.DF_yyyyMMddHHmmss));
+ map.put("create_time", order.getCreateTime());
map.put("create_time_ts", order.getCreateTimeTs());
if (order.getCloseTime() != null) {
@@ -812,10 +822,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());
}
@@ -852,4 +862,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