From 43d1131549c5ee6128f0ad4160df9cfce43db067 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Sun, 07 Jun 2026 00:02:32 +0800
Subject: [PATCH] 1
---
trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderCalculationServiceImpl.java | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
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 f9afbb6..3d3ccdc 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
@@ -19,7 +19,6 @@
import java.math.RoundingMode;
import java.util.Date;
import java.util.List;
-import java.util.Objects;
@Slf4j
@Service
@@ -197,11 +196,7 @@
BigDecimal forceClose;
if (order_close_line_type == 1) {
Wallet wallet = this.walletService.findByUserId(order.getPartyId().toString());
- if (wallet == null) {
- forceClose = calculateType2ForceClosePrice(order);
- } else {
- forceClose = calculateType1ForceClosePrice(order, wallet);
- }
+ forceClose = calculateType1ForceClosePrice(order, wallet);
} else {
forceClose = calculateType2ForceClosePrice(order);
}
@@ -244,19 +239,16 @@
List<ContractOrder> list = contractOrderService.findSubmitted(order.getPartyId(), null, null, null, null, null);
BigDecimal otherEquity = BigDecimal.ZERO;
for (ContractOrder contractOrder : list) {
- if (contractOrder == null) {
- continue;
- }
if (ContractOrder.STATE_SUBMITTED.equals(contractOrder.getState())) {
contractOrderService.wrapProfit(contractOrder);
}
- if (Objects.equals(order.getUuid(), contractOrder.getUuid())) {
+ if (order.getUuid().equals(contractOrder.getUuid())) {
continue;
}
otherEquity = otherEquity.add(defaultZero(contractOrder.getProfit()).add(defaultZero(contractOrder.getDeposit())));
}
- BigDecimal baseEquity = defaultZero(wallet != null ? wallet.getMoney() : null)
+ BigDecimal baseEquity = defaultZero(wallet.getMoney())
.add(otherEquity)
.add(defaultZero(order.getDeposit()));
BigDecimal priceOffset = baseEquity.divide(volumeFactor, 10, RoundingMode.HALF_UP);
--
Gitblit v1.9.3