From 0ebdfd97b5400c864584147bd72a0de768172d6e Mon Sep 17 00:00:00 2001
From: dd <gitluke@outlook.com>
Date: Tue, 27 Jan 2026 10:19:48 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/UserAssetsServices.java |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/UserAssetsServices.java b/src/main/java/com/nq/service/impl/UserAssetsServices.java
index 990e06c..6f22fd7 100644
--- a/src/main/java/com/nq/service/impl/UserAssetsServices.java
+++ b/src/main/java/com/nq/service/impl/UserAssetsServices.java
@@ -77,9 +77,7 @@
         List<UserAssets> userAssetsList =  userAssetsMapper.selectList(queryWrapper);
         List<EStockType> stockTypes = Arrays.asList(
                 EStockType.US,
-                EStockType.HK,
-                EStockType.IN,
-                EStockType.TW
+                EStockType.JP
         );
         for (EStockType stockType : stockTypes) {
             //是否存在记录
@@ -322,6 +320,16 @@
                userAssets.setCumulativeProfitAndLoss(userAssets.getCumulativeProfitAndLoss().add(amount));
            }
            extracted(userAssets);
+        }else if(Objects.equals(eUserAssets.getCode(), EUserAssets.PENDING_ORDER_FREEZE.getCode())){
+            // 挂单冻结资金:从可用余额转到冻结金额
+            // amount 是负数,表示扣除
+            userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
+            userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(amount.negate()));
+        }else if(Objects.equals(eUserAssets.getCode(), EUserAssets.PENDING_ORDER_UNFREEZE.getCode())){
+            // 取消挂单解冻资金:从冻结金额转回可用余额
+            // amount 是正数,表示增加
+            userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
+            userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(amount));
         }
 
         /*if(null != userPosition){

--
Gitblit v1.9.3