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 | 5 +++--
1 files changed, 3 insertions(+), 2 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 3d3ccdc..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
@@ -19,6 +19,7 @@
import java.math.RoundingMode;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Slf4j
@Service
@@ -242,13 +243,13 @@
if (ContractOrder.STATE_SUBMITTED.equals(contractOrder.getState())) {
contractOrderService.wrapProfit(contractOrder);
}
- if (order.getUuid().equals(contractOrder.getUuid())) {
+ if (Objects.equals(order.getUuid(), contractOrder.getUuid())) {
continue;
}
otherEquity = otherEquity.add(defaultZero(contractOrder.getProfit()).add(defaultZero(contractOrder.getDeposit())));
}
- BigDecimal baseEquity = defaultZero(wallet.getMoney())
+ BigDecimal baseEquity = defaultZero(wallet != null ? wallet.getMoney() : null)
.add(otherEquity)
.add(defaultZero(order.getDeposit()));
BigDecimal priceOffset = baseEquity.divide(volumeFactor, 10, RoundingMode.HALF_UP);
--
Gitblit v1.9.3