From 295e7f3e507e0a147630f7874caded95dba55342 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 08 Aug 2025 19:48:59 +0800
Subject: [PATCH] 1
---
trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderService.java | 13 +++++++++----
1 files changed, 9 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 e3d5cc6..15228c1 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
@@ -689,9 +689,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 +782,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) {
--
Gitblit v1.9.3