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/ContractOrderService.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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 69e6e2d..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
@@ -281,10 +281,11 @@
Wallet wallet = walletService.findByUserId(order.getPartyId());
if (wallet.getMoney().add(profit).compareTo(BigDecimal.ZERO) < 0) {
- // 如果结果是负数，就归零
+ /*// 如果结果是负数，就归零
if (wallet.getMoney().compareTo(BigDecimal.ZERO) < 0) {
profit = BigDecimal.ZERO;
- }
+ }*/
+ profit = wallet.getMoney().negate();
}
walletService.updateMoney(order.getSymbol(), partyId, profit, BigDecimal.ZERO,
@@ -300,6 +301,9 @@
* 合约产品平仓后添加当前流水setWithdraw_limit_now_amount
*/
User party = userService.getById(order.getPartyId());
+ if (party.getWithdrawLimitNowAmount() == null) {
+ party.setWithdrawLimitNowAmount(BigDecimal.ZERO);
+ }
party.setWithdrawLimitNowAmount(party.getWithdrawLimitNowAmount().add(order.getDepositOpen()));
userService.updateById(party);
if (ObjectUtils.isEmpty(order.getCloseAvgPrice())) {
@@ -525,7 +529,7 @@
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){
+ 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).add(order.getAddDepositOpen());
@@ -694,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