From 6fd35ed620c5cc01a69d72b9d4d0e93703638847 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Thu, 05 Mar 2026 17:00:12 +0800
Subject: [PATCH] 全仓
---
trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderCalculationServiceImpl.java | 10 ++++++----
trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderService.java | 6 ++++--
trading-order-admin/src/main/java/com/yami/trading/admin/task/contract/ContractOrderCalculationJob.java | 2 +-
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/task/contract/ContractOrderCalculationJob.java b/trading-order-admin/src/main/java/com/yami/trading/admin/task/contract/ContractOrderCalculationJob.java
index 84a2c2d..cd3e2ae 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/task/contract/ContractOrderCalculationJob.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/task/contract/ContractOrderCalculationJob.java
@@ -73,7 +73,7 @@
/**
* 暂停0.1秒
*/
- ThreadUtils.sleep(3000);
+ ThreadUtils.sleep(1000);
}
}
}
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderCalculationServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderCalculationServiceImpl.java
index b8b95ac..3e356cb 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderCalculationServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderCalculationServiceImpl.java
@@ -118,7 +118,7 @@
Item item = itemService.findBySymbol(order.getSymbol());
- if(null != order.getProfitLossRatio()){//根据后台设置的盈亏比来
+ if(null != order.getProfitLossRatio() && order.getProfitLossRatio() > 0){//根据后台设置的盈亏比来
order.setProfit(order.getDepositOpen().multiply(new BigDecimal((order.getProfitLossRatio()/100))).setScale(2, RoundingMode.DOWN));
}else{
/*
@@ -128,7 +128,7 @@
* 偏差点位
*/
BigDecimal point = currentPrice.subtract(order.getTradeAvgPrice());
- BigDecimal amount = point.multiply(new BigDecimal("0.01")).multiply(order.getVolumeOpen()).setScale(4, BigDecimal.ROUND_DOWN);;
+ BigDecimal amount = point.multiply(new BigDecimal("0.01")).multiply(order.getVolumeOpen()).setScale(4, BigDecimal.ROUND_DOWN);
if (ContractOrder.DIRECTION_BUY.equals(order.getDirection())) {
order.setProfit(amount);
} else{
@@ -169,8 +169,10 @@
}*/
// 获取当前账户余额并加到收益中
- Map<String, Object> moneyAll = walletService.getMoneyAll(order.getPartyId());
- earnings = earnings.add(new BigDecimal(moneyAll.get("money_all_coin").toString()));
+ //Map<String, Object> moneyAll = walletService.getMoneyAll(order.getPartyId());
+
+ Wallet wallet = walletService.saveWalletByPartyId(order.getPartyId());
+ earnings = earnings.add(wallet.getMoney());
earnings = earnings.add(order.getDepositOpen());
} else {
// 如果不符合条件，直接使用 order.getDepositOpen() 作为收益
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 d11bea5..82a5529 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
@@ -698,8 +698,10 @@
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()));
+ //Map<String, Object> moneyAll = walletService.getMoneyAll(order.getPartyId());
+ //earnings = order.getDepositOpen().add(new BigDecimal(moneyAll.get("money_wallet").toString()));
+ Wallet wallet = walletService.saveWalletByPartyId(order.getPartyId());
+ earnings = order.getDepositOpen().add(earnings.add(wallet.getMoney()));
}else{
earnings = order.getDepositOpen().add(order.getAddDepositOpen());
}
--
Gitblit v1.9.3