From b28a97e1bf66e3279e78f31ce58122427787ceec Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 11 Jun 2026 09:44:20 +0800
Subject: [PATCH] 1
---
trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderCalculationServiceImpl.java | 9 +--------
1 files changed, 1 insertions(+), 8 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..47ad542 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
@@ -197,11 +197,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,9 +240,6 @@
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);
}
--
Gitblit v1.9.3