From f7cc4ee83280e7f9ab3b931de37ca0698ed33f67 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 25 Apr 2024 20:09:21 +0800
Subject: [PATCH] 1

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

diff --git a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
index 9729dfb..0d009e5 100644
--- a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
@@ -84,7 +84,8 @@
         }
             User user = iUserService.getCurrentRefreshUser(request);
             if (model.getNewCode() != null) {
-                StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<StockSubscribe>().eq("code", model.getNewCode()));
+                StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<StockSubscribe>()
+                        .eq("code", model.getNewCode()).eq("type",model.getType()));
                 //实名认证开关
                 SiteProduct siteProduct = iSiteProductService.getProductSetting();
                 if (siteProduct.getRealNameDisplay() && user.getIsActive() != 2) {
@@ -99,7 +100,7 @@
                 UserStockSubscribe userStockSubscribe = userStockSubscribeMapper.selectOne(new QueryWrapper<UserStockSubscribe>().eq(
                         "new_code", model.getNewCode()).eq("user_id", user.getId()).eq("type",model.getType()));
                 if (userStockSubscribe != null) {
-                    return ServerResponse.createByErrorMsg("请勿重复申购",request);
+                    return ServerResponse.createByErrorMsg("请勿重复申请",request);
                 }
                 if (siteProduct.getRealNameDisplay() && user.getIsLock().intValue() == 1) {
                     return ServerResponse.createByErrorMsg("订单失败,帐户已被锁定",request);
@@ -181,7 +182,8 @@
             if (userStockSubscribe.getStatus() == 5) {
                 return ServerResponse.createByErrorMsg("It's been converted");
             }
-            StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<>(new StockSubscribe()).eq("code", userStockSubscribe.getNewCode()));
+            StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<>(new StockSubscribe())
+                    .eq("code", userStockSubscribe.getNewCode()).eq("type",userStockSubscribe.getType()));
             if((model.getStatus() == 3 && model.getApplyNumber() == null) || (model.getStatus() == 3 && model.getApplyNumber() == 0) ){
                 return ServerResponse.createByErrorMsg("中签数量不能小于0");
             }
@@ -279,7 +281,8 @@
                 model.setUserId(user.getId());
                 model.setAgentId(user.getAgentId());
                 model.setAgentName(user.getAgentName());
-                StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<>(new StockSubscribe()).eq("code", model.getNewCode()));
+                StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<>(new StockSubscribe())
+                        .eq("code", model.getNewCode()).eq("type",model.getType()));
                 if (stockSubscribe == null) {
                     return ServerResponse.createByErrorMsg("Failed. Ipo information does not exist");
                 }
@@ -376,7 +379,9 @@
 
             List<UserStockSubscribe> list = new ArrayList<>();
             for (UserStockSubscribe userStockSubscribe1 : userStockSubscribe) {
-                StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<>(new StockSubscribe()).eq("code", userStockSubscribe1.getNewCode()));
+                StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<>(new StockSubscribe())
+                        .eq("code", userStockSubscribe1.getNewCode())
+                        .eq("type",userStockSubscribe1.getType()));
                 if (stockSubscribe != null) {
                     list.add(userStockSubscribe1);
                 }

--
Gitblit v1.9.3