From 175d7da90c49383334d285939dcc00caee030c80 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Mon, 02 Mar 2026 16:29:13 +0800
Subject: [PATCH] u盾

---
 trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderService.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 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..e556149 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
@@ -300,6 +300,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 +528,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());

--
Gitblit v1.9.3