From a6c07a0526befbbd8194c97eb8f64b84b1a477a1 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Thu, 02 Apr 2026 16:48:15 +0800
Subject: [PATCH] 1
---
trading-order-service/src/main/java/com/yami/trading/service/future/FuturesOrderService.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/future/FuturesOrderService.java b/trading-order-service/src/main/java/com/yami/trading/service/future/FuturesOrderService.java
index f1c05e2..bae03b2 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/future/FuturesOrderService.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/future/FuturesOrderService.java
@@ -677,7 +677,12 @@
// 24小时内交割合约客户最高赢率（正式用户交割盈利/正式用户交割金额），高于设定的值时客户必亏，低于时则不限制（范例：10，为最高赢10%），为空则不限制
double futures_most_prfit_level = 0;
- futures_most_prfit_level = Double.valueOf(sysparaService.find("futures_most_prfit_level").getSvalue());
+ User party = userService.getById(order.getPartyId());
+ if (party != null && party.getFuturesMostPrfitLevel() != null) {
+ futures_most_prfit_level = party.getFuturesMostPrfitLevel();
+ } else {
+ futures_most_prfit_level = Double.valueOf(sysparaService.find("futures_most_prfit_level").getSvalue());
+ }
if (futures_most_prfit_level > 0) {
List<FuturesOrder> futuresOrders24Hour = new ArrayList();
futuresOrders24Hour = findByHourAndSate("created", Constants.SECURITY_ROLE_MEMBER);
@@ -704,11 +709,13 @@
"futures24Profit:{}, futures24Amount:{}, futures_ratio:{}, futures_most_prfit_level:{}",
order.getOrderNo(), futures24Profit, futures24Amount, futures_ratio, futures_most_prfit_level);
- ProfitLoss = "loss";
+
// ProfitAndLossConfig_on = 1;
}
}
+ }else{
+ ProfitLoss = "loss";
}
@@ -871,7 +878,7 @@
//删除提示
// tipService.deleteTip(order.getUuid());
- User party = userService.getById(order.getPartyId());
+ //User party = userService.getById(order.getPartyId());
party.setWithdrawLimitNowAmount(new BigDecimal(Arith.add(party.getWithdrawLimitNowAmount().doubleValue(), volume)));
userService.updateById(party);
// if (Constants.SECURITY_ROLE_MEMBER.equals(party.getRoleName())) {
--
Gitblit v1.9.3