From dfd95b8354429de9b14087cb96cba0ba0cd7265a Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Tue, 15 Jul 2025 14:07:06 +0800
Subject: [PATCH] 大宗交易修改

---
 src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
index 34261d8..535c81f 100644
--- a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
@@ -86,7 +86,7 @@
         }
         User user = iUserService.getCurrentRefreshUser(request);
         synchronized (user.getId()){
-            UserAssets userAssets =   iUserAssetsServices.assetsByTypeAndUserId("IN",user.getId());
+
             if (model.getNewCode() != null) {
                 StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<StockSubscribe>()
                         .eq("newlist_id", model.getNewlistId()));
@@ -99,6 +99,7 @@
                 if (siteProduct.getRealNameDisplay() && user.getIsActive() != 2) {
                     return ServerResponse.createByErrorMsg("订单失败,请先实名认证",request);
                 }
+                UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId(stockSubscribe.getStockType(), user.getId());
                 if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
                     return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
                 }
@@ -255,7 +256,7 @@
             }
 
             //客户中签直接扣除客户账户可用资金
-            UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId("IN", userStockSubscribe.getUserId());
+            UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId(stockSubscribe.getStockType(), userStockSubscribe.getUserId());
             if (model.getStatus() == 3 && model.getApplyNumber() != null){
                 if(stockSubscribe.getType() == 1){
                     model.setBond((stockSubscribe.getMinPrice() != null ? stockSubscribe.getMinPrice() : stockSubscribe.getPrice()).multiply(BigDecimal.valueOf(model.getApplyNumber())));
@@ -474,7 +475,7 @@
             }
             return ServerResponse.createBySuccess(list);
         }
-        return ServerResponse.createByErrorMsg("请先登录",request);
+        return ServerResponse.createByErrorCodeMsg(401,"请先登录");
     }
     /**
      * 新股申购-用户提交金额
@@ -518,7 +519,7 @@
                 return ServerResponse.createByErrorMsg("新股认购订单不存在!",request);
             }
         }
-        return ServerResponse.createByErrorMsg("请先登录",request);
+        return ServerResponse.createByErrorCodeMsg(401,"请先登录");
     }
     /**
      * 新股申购-删除

--
Gitblit v1.9.3