From bfcbef7a6bf2eb73bbf7ae84dac49a8f49db1e1c Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Tue, 08 Jul 2025 14:49:45 +0800
Subject: [PATCH] 修改股票类型

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

diff --git a/src/main/java/com/nq/service/impl/UserAssetsServices.java b/src/main/java/com/nq/service/impl/UserAssetsServices.java
index 6a5912d..3a5b5e1 100644
--- a/src/main/java/com/nq/service/impl/UserAssetsServices.java
+++ b/src/main/java/com/nq/service/impl/UserAssetsServices.java
@@ -51,8 +51,11 @@
 
     @Override
     public UserAssets assetsByTypeAndUserId(String accetType, Integer userId) {
-        if(accetType.equals("SZHB")){
+        /*if(accetType.equals("SZHB")){
             accetType = "US";
+        }*/
+        if(accetType.equals(EStockType.US.getCode()) || accetType.equals("IN")){
+            accetType = EStockType.MX.getCode();
         }
         QueryWrapper<UserAssets>  queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("accect_type",accetType);
@@ -169,7 +172,7 @@
     @Override
     public Boolean availablebalanceChange(String accetType, Integer userId, EUserAssets eUserAssets, BigDecimal amount, String desc, String descType) {
 
-        UserAssets userAssets =   assetsByTypeAndUserId(accetType,userId);
+        UserAssets userAssets = assetsByTypeAndUserId(accetType,userId);
         UserPosition userPosition = userPositionMapper.selectOne(new LambdaQueryWrapper<UserPosition>().gt(UserPosition::getAmountToBeCovered, BigDecimal.ZERO).eq(UserPosition::getUserId,userAssets.getUserId()));
         String type = eUserAssets.getDesc();
         String before = userAssets.getAvailableBalance().toString();
@@ -211,9 +214,9 @@
                    userAssets.setAmountToBeCovered(BigDecimal.ZERO);
                    userAssets.setHandlingChargeWritten(BigDecimal.ZERO);
                }else{
-                   BigDecimal amountToBeCovered = userAssets.getAmountToBeCovered().subtract(amount);
                    userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(amount));
-                   userAssets.setAmountToBeCovered(amountToBeCovered);
+                   userAssets.setHandlingChargeWritten(BigDecimal.ZERO);
+                   userAssets.setAmountToBeCovered(availableBalance.negate());
                }
            }else{
                userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));

--
Gitblit v1.9.3