From 7db8e7cd6fe90656deb4181e0ec354350d61428f Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 27 May 2025 16:40:43 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java |  284 ++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 182 insertions(+), 102 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
index 7469774..f202434 100644
--- a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
@@ -1,6 +1,7 @@
 package com.nq.service.impl;
 
 
+import cn.hutool.core.convert.Convert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -19,6 +20,7 @@
 import com.nq.utils.redis.JsonUtil;
 import com.nq.utils.redis.RedisShardedPoolUtils;
 import com.nq.utils.stock.BuyAndSellUtils;
+import com.nq.vo.stock.UserStockSubscribeAddIn;
 import com.sun.org.apache.bcel.internal.generic.RETURN;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -77,86 +79,143 @@
      */
     @Override
     @Transactional
-    public ServerResponse insert(UserStockSubscribe model, HttpServletRequest request) throws Exception {
+    public ServerResponse insert(UserStockSubscribeAddIn model, HttpServletRequest request) throws Exception {
         int ret = 0;
         if (model == null) {
             return ServerResponse.createByErrorMsg("参数错误",request);
         }
         User user = iUserService.getCurrentRefreshUser(request);
-        UserAssets userAssets =   iUserAssetsServices.assetsByTypeAndUserId("IN",user.getId());
-        if (model.getNewCode() != null) {
-            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) {
-                return ServerResponse.createByErrorMsg("订单失败,请先实名认证",request);
-            }
-            if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
-                return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
-            }
-            if(new Date().before(stockSubscribe.getSubscribeTime()) && new Date().after(stockSubscribe.getSubscribeTime()) ){
-                return ServerResponse.createByErrorMsg("不在认缴或配售时间之内",request);
-            }
-
-            //重复申购限制
-            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);
-            }
-            if (siteProduct.getRealNameDisplay() && user.getIsLock().intValue() == 1) {
-                return ServerResponse.createByErrorMsg("订单失败,帐户已被锁定",request);
-            }
-            if (stockSubscribe == null) {
-                return ServerResponse.createByErrorMsg("新的股票代码不存在",request);
-            }
-            if (model.getApplyNums() == null || model.getApplyNums() > stockSubscribe.getOrderNumber()|| model.getApplyNums() < 500) {
-                return ServerResponse.createByErrorMsg("最小起订量是500,最大值"
-                        + stockSubscribe.getOrderNumber(),request);
-            }
-            if(stockSubscribe.getType() == 1){
-                model.setUserId(user.getId());
-                model.setNewName(stockSubscribe.getName());
-                model.setAgentId(user.getAgentId());
-                model.setAgentName(user.getAgentName());
-                model.setPhone(user.getPhone());
-                model.setBuyPrice(stockSubscribe.getPrice());
-                model.setBond(new BigDecimal(model.getApplyNums()).multiply(stockSubscribe.getPrice()));
-                model.setRealName(Objects.equals(user.getRealName(), "")||user.getRealName()==null ?"模拟用户无实名":user.getRealName());
-                model.setAddTime(new Date());
-                model.setOrderNo(KeyUtils.getUniqueKey());
-                model.setType(stockSubscribe.getType());
-                ret = userStockSubscribeMapper.insert(model);
-                if (ret > 0) {
-                    return ServerResponse.createBySuccessMsg("申购成功",request);
-                } else {
-                    return ServerResponse.createByErrorMsg("申购失败",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()));
+                //判断购买新股需不需要密钥
+                if(StringUtils.isNotEmpty(stockSubscribe.getPassword()) && !stockSubscribe.getPassword().equals(model.getPassword())){
+                    return ServerResponse.createByErrorMsg("密钥输入错误",request);
                 }
-            }else{
-               BigDecimal bound =  new BigDecimal(model.getApplyNums()).multiply(stockSubscribe.getPrice());
-               BigDecimal useEnaAmount = iUserAssetsServices.getAvailableBalance(EStockType.IN.getCode(), user.getId());
-               if(useEnaAmount.compareTo(bound)<0){
-                   return ServerResponse.createByErrorMsg("余额不足,配售失败",request);
-               }
-                model.setUserId(user.getId());
-                model.setNewName(stockSubscribe.getName());
-                model.setAgentId(user.getAgentId());
-                model.setAgentName(user.getAgentName());
-                model.setPhone(user.getPhone());
-                model.setBuyPrice(stockSubscribe.getPrice());
-                model.setBond(new BigDecimal(model.getApplyNums()).multiply(stockSubscribe.getPrice()));
-                model.setRealName(Objects.equals(user.getRealName(), "")||user.getRealName()==null ?"模拟用户无实名":user.getRealName());
-                model.setAddTime(new Date());
-                model.setOrderNo(KeyUtils.getUniqueKey());
-                model.setType(stockSubscribe.getType());
-                model.setDbMoney(BigDecimal.ZERO);
-                ret = userStockSubscribeMapper.insert(model);
-                iUserAssetsServices.availablebalanceChange(EStockType.IN.getCode(), user.getId(),EUserAssets.BUY,bound.negate(),"","");
-                if (ret > 0) {
-                    return ServerResponse.createBySuccessMsg("配售成功",request);
-                } else {
-                    return ServerResponse.createByErrorMsg("配售失败",request);
+                //实名认证开关
+                SiteProduct siteProduct = iSiteProductService.getProductSetting();
+                if (siteProduct.getRealNameDisplay() && user.getIsActive() != 2) {
+                    return ServerResponse.createByErrorMsg("订单失败,请先实名认证",request);
+                }
+                if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
+                    return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
+                }
+
+                if ( model.getApplyNums() == null){
+                    // 申请数量为空时返回错误信息
+                    return ServerResponse.createByErrorMsg("申请数量不能为空", request);
+                }
+                if(model.getApplyNums() < stockSubscribe.getMinNumber() ){
+                    return ServerResponse.createByErrorMsg("最少申购:" + stockSubscribe.getMinNumber(), request);
+                }
+                if (model.getApplyNums() > stockSubscribe.getOrderNumber()){
+                    return ServerResponse.createByErrorMsg("最多可申购:" + stockSubscribe.getOrderNumber(), request);
+                }
+
+                BigDecimal sumPrice = stockSubscribe.getPrice().multiply(new BigDecimal(model.getApplyNums()));
+                if(userAssets.getAvailableBalance().compareTo(sumPrice) < 0){
+                    return ServerResponse.createByErrorMsg("账户余额不足", request);
+                }
+
+                Date currentDate = new Date();
+                if(currentDate.before(stockSubscribe.getSubscriptionTime())){
+                    return ServerResponse.createByErrorMsg("未开售",request);
+                }
+                if(currentDate.after(stockSubscribe.getSubscribeTime())){
+                    return ServerResponse.createByErrorMsg("已结束",request);
+                }
+
+//            //重复申购限制
+                Long count = userStockSubscribeMapper.selectCount(new QueryWrapper<UserStockSubscribe>().eq(
+                        "new_code", model.getNewCode()).eq("user_id", user.getId()).eq("type", model.getType()));
+                if (count > 0) {
+                    return ServerResponse.createByErrorMsg("请勿重复申请",request);
+                }
+                if (siteProduct.getRealNameDisplay() && user.getIsLock().intValue() == 1) {
+                    return ServerResponse.createByErrorMsg("订单失败,帐户已被锁定",request);
+                }
+                if (stockSubscribe == null) {
+                    return ServerResponse.createByErrorMsg("新的股票代码不存在",request);
+                }
+
+                model.setApplyNums((int) (model.getApplyNums()*stockSubscribe.getLever()));
+
+                //计算申购金额
+                BigDecimal bound;
+                if (stockSubscribe.getMinPrice() != null && stockSubscribe.getMinPrice().compareTo(BigDecimal.ZERO) > 0) {
+                    bound =  new BigDecimal(model.getApplyNums()).multiply(stockSubscribe.getMinPrice());
+                }else{
+                    bound =  new BigDecimal(model.getApplyNums()).multiply(stockSubscribe.getPrice());
+                }
+
+                if(stockSubscribe.getType() == 1){
+                    model.setUserId(user.getId());
+                    model.setNewName(stockSubscribe.getName());
+                    model.setAgentId(user.getAgentId());
+                    model.setAgentName(user.getAgentName());
+                    model.setPhone(user.getPhone());
+                    model.setBuyPrice(stockSubscribe.getMinPrice() != null ? stockSubscribe.getMinPrice() : stockSubscribe.getPrice());
+                    model.setBond(new BigDecimal(model.getApplyNums()).multiply((stockSubscribe.getMinPrice() != null ? stockSubscribe.getMinPrice() : stockSubscribe.getPrice())));
+                    model.setRealName(Objects.equals(user.getRealName(), "")||user.getRealName()==null ?"模拟用户无实名":user.getRealName());
+                    model.setAddTime(new Date());
+                    model.setOrderNo(KeyUtils.getUniqueKey());
+                    model.setType(stockSubscribe.getType());
+                    UserStockSubscribe userStockSubscribe = Convert.convert(UserStockSubscribe.class, model);
+                    userStockSubscribe.setNewStockId(stockSubscribe.getNewlistId());
+                    ret = userStockSubscribeMapper.insert(userStockSubscribe);
+
+                    BigDecimal subtract = userAssets.getAvailableBalance().subtract(bound);
+                    if(subtract.compareTo(BigDecimal.ZERO) >= 0){
+                        userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(bound));
+                        userAssets.setAvailableBalance(subtract);
+                    }else{
+                        userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(userAssets.getAvailableBalance()));
+                        userAssets.setAvailableBalance(BigDecimal.ZERO);
+                        userAssets.setAmountToBeCovered(userAssets.getAmountToBeCovered().add(subtract.abs()));
+                    }
+                    userAssetsMapper.updateById(userAssets);
+
+                    if (ret > 0) {
+                        return ServerResponse.createBySuccessMsg("申购成功",request);
+                    } else {
+                        return ServerResponse.createByErrorMsg("申购失败",request);
+                    }
+                }else{
+
+//               BigDecimal bound;
+//               if(stockSubscribe.getMinPrice() != null || stockSubscribe.getMinPrice().compareTo(BigDecimal.ZERO)<0){
+//                   bound =  new BigDecimal(model.getApplyNums()).multiply(stockSubscribe.getMinPrice());
+//               }else{
+//                   bound =  new BigDecimal(model.getApplyNums()).multiply(stockSubscribe.getPrice());
+//               }
+//
+                    BigDecimal useEnaAmount = iUserAssetsServices.getAvailableBalance(EStockType.IN.getCode(), user.getId());
+                    if(useEnaAmount.compareTo(bound)<0){
+                        return ServerResponse.createByErrorMsg("余额不足,配售失败",request);
+                    }
+                    model.setUserId(user.getId());
+                    model.setNewName(stockSubscribe.getName());
+                    model.setAgentId(user.getAgentId());
+                    model.setAgentName(user.getAgentName());
+                    model.setPhone(user.getPhone());
+                    model.setBuyPrice(stockSubscribe.getMinPrice() != null ? stockSubscribe.getMinPrice() : stockSubscribe.getPrice());
+                    model.setBond(new BigDecimal(model.getApplyNums()).multiply((stockSubscribe.getMinPrice() != null ? stockSubscribe.getMinPrice() : stockSubscribe.getPrice())));
+                    model.setRealName(Objects.equals(user.getRealName(), "")||user.getRealName()==null ?"模拟用户无实名":user.getRealName());
+                    model.setAddTime(new Date());
+                    model.setOrderNo(KeyUtils.getUniqueKey());
+                    model.setType(stockSubscribe.getType());
+                    model.setDbMoney(BigDecimal.ZERO);
+                    UserStockSubscribe userStockSubscribe = Convert.convert(UserStockSubscribe.class, model);
+                    userStockSubscribe.setNewStockId(stockSubscribe.getNewlistId());
+                    ret = userStockSubscribeMapper.insert(userStockSubscribe);
+                    iUserAssetsServices.availablebalanceChange(EStockType.IN.getCode(), user.getId(),EUserAssets.BUY,bound.negate(),"","");
+                    if (ret > 0) {
+                        return ServerResponse.createBySuccessMsg("配售成功",request);
+                    } else {
+                        return ServerResponse.createByErrorMsg("配售失败",request);
+                    }
                 }
             }
         }
@@ -173,7 +232,7 @@
      */
     @Override
     @Transactional
-    public ServerResponse save(UserStockSubscribe model, HttpServletRequest request) {
+    public ServerResponse save(UserStockSubscribe model, HttpServletRequest request) throws Exception {
         int ret = 0;
         if( model.getId() != null  ){
             if (model.getStatus() == 3||model.getStatus() == 2) {
@@ -187,47 +246,72 @@
                 return ServerResponse.createByErrorMsg("不能更改申购状态");
             }
             StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<>(new StockSubscribe())
-                    .eq("code", userStockSubscribe.getNewCode()).eq("type",userStockSubscribe.getType()));
+                    .eq("newlist_id", userStockSubscribe.getNewStockId()));
             if((model.getStatus() == 3 && model.getApplyNumber() == null) || (model.getStatus() == 3 && model.getApplyNumber() == 0) ){
                 return ServerResponse.createByErrorMsg("中签数量不能小于0");
             }
+            if(model.getStatus() == 3 && model.getApplyNumber()>userStockSubscribe.getApplyNums()){
+                return  ServerResponse.createByErrorMsg("配置中签数量不能超过申请数量",request);
+            }
+
+            //客户中签直接扣除客户账户可用资金
+            UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId("IN", userStockSubscribe.getUserId());
             if (model.getStatus() == 3 && model.getApplyNumber() != null){
                 if(stockSubscribe.getType() == 1){
-                    model.setBond(stockSubscribe.getPrice().multiply(BigDecimal.valueOf(model.getApplyNumber())));
+                    model.setBond((stockSubscribe.getMinPrice() != null ? stockSubscribe.getMinPrice() : stockSubscribe.getPrice()).multiply(BigDecimal.valueOf(model.getApplyNumber())));
                     model.setDbMoney(model.getDbMoney());
-                    //客户中签直接扣除客户账户可用资金
-                    UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId("IN", userStockSubscribe.getUserId());
+
                     if(null == userAssets){
                         return ServerResponse.createByErrorMsg("客户资金账户不存在");
                     }
-                    BigDecimal decimal = userStockSubscribe.getBuyPrice().multiply(new BigDecimal(model.getApplyNumber()));//中签总价
-                    BigDecimal availableBalance = userAssets.getAvailableBalance().subtract(decimal);//剩余可用余额
-                    if(decimal.compareTo(userAssets.getAvailableBalance()) <= 0){
-                        userAssets.setAvailableBalance(availableBalance);
+                    int applyNumber = userStockSubscribe.getApplyNums() - model.getApplyNumber();
+                    if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) <= 0){
+                        if(applyNumber > 0){
+                            //需要退回的资金
+                            BigDecimal refundPrice = userStockSubscribe.getBuyPrice().multiply(new BigDecimal(applyNumber));
+                            userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(refundPrice));
+                            userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(refundPrice));
+                        }
                     }else{
-                        BigDecimal amountToBeCovered = decimal.subtract(userAssets.getAvailableBalance());//待补金额
-                        userAssets.setAvailableBalance(BigDecimal.ZERO);
-                        userAssets.setAmountToBeCovered(userAssets.getAmountToBeCovered().add(amountToBeCovered));
+                        if(applyNumber > 0){
+                            BigDecimal refundPrice = userStockSubscribe.getBuyPrice().multiply(new BigDecimal(applyNumber));
+                            BigDecimal subtract = refundPrice.subtract(userAssets.getAmountToBeCovered());
+                            if(subtract.compareTo(BigDecimal.ZERO) <= 0){//如果退回的资金不足补足待补则直接减
+                                userAssets.setAmountToBeCovered(userAssets.getAmountToBeCovered().subtract(refundPrice));
+                            }else{//如果退回的资金足够填补待补资金还有剩余,则返回余额
+                                userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(refundPrice).add(userAssets.getAmountToBeCovered()));
+                                userAssets.setAmountToBeCovered(BigDecimal.ZERO);
+                                userAssets.setAvailableBalance(subtract);
+                            }
+                        }
                     }
-                    userAssetsMapper.updateById(userAssets);
                     ret = userStockSubscribeMapper.update1(model);
+                    userAssetsMapper.updateById(userAssets);
+                    iUserPositionService.newStockToPosition(model.getId(),userAssets.getAmountToBeCovered());//转持仓
+                    model.setStatus(5);
                 }else{
                     if(model.getApplyNumber()>model.getApplyNums()){
                         return  ServerResponse.createByErrorMsg("配置中签数量不能超过申请数量",request);
                     }
                     BigDecimal cCount = new BigDecimal(model.getApplyNums()-model.getApplyNumber());
-                    BigDecimal tMoney = stockSubscribe.getPrice().multiply(cCount);
+                    BigDecimal tMoney = ((stockSubscribe.getMinPrice() != null ? stockSubscribe.getMinPrice() : stockSubscribe.getPrice())).multiply(cCount);
                     iUserAssetsServices.availablebalanceChange(EStockType.IN.getCode(),userStockSubscribe.getUserId(),
                             EUserAssets.TOP_UP,tMoney,"","");
-                    model.setBond(stockSubscribe.getPrice().multiply(BigDecimal.valueOf(model.getApplyNumber())));
+                    model.setBond((stockSubscribe.getMinPrice() != null ? stockSubscribe.getMinPrice() : stockSubscribe.getPrice()).multiply(BigDecimal.valueOf(model.getApplyNumber())));
                     model.setDbMoney(BigDecimal.ZERO);
                     model.setStatus(4);
                     ret = userStockSubscribeMapper.update1(model);
                 }
             }else if (model.getStatus() == 2){
+                BigDecimal bond = (stockSubscribe.getMinPrice() != null ? stockSubscribe.getMinPrice() : stockSubscribe.getPrice()).multiply(BigDecimal.valueOf(model.getApplyNums()));
+                BigDecimal subtractMoney = bond.subtract(userAssets.getAmountToBeCovered());//需要退回的钱
+                userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(subtractMoney.abs()));
+                userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(subtractMoney));
+                userAssets.setAmountToBeCovered(BigDecimal.ZERO);
+                userAssetsMapper.updateById(userAssets);
                 ret = userStockSubscribeMapper.update1(model);
             }else if (model.getStatus() == 5){
-                    return iUserPositionService.newStockToPosition(model.getId());
+                    return iUserPositionService.newStockToPosition(model.getId(),BigDecimal.ZERO);
 
             }
                 if(ret>0 && model.getStatus() == 3 ){
@@ -273,8 +357,6 @@
                     }
 
                 }
-
-
         } else{
             if(model.getPhone() != null&&model.getId()==null) {
                 User user = userMapper.findByPhone(model.getPhone());
@@ -286,13 +368,13 @@
                 model.setAgentId(user.getAgentId());
                 model.setAgentName(user.getAgentName());
                 StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<>(new StockSubscribe())
-                        .eq("code", model.getNewCode()));
+                        .eq("newlist_id", model.getNewStockId()));
                 if (stockSubscribe == null) {
                     return ServerResponse.createByErrorMsg("Failed. Ipo information does not exist");
                 }
 
                 model.setNewName(stockSubscribe.getName());
-                model.setBuyPrice(stockSubscribe.getPrice());
+                model.setBuyPrice(stockSubscribe.getMinPrice() != null ? stockSubscribe.getMinPrice() : stockSubscribe.getPrice());
                 if (model.getApplyNums() > stockSubscribe.getOrderNumber() || model.getApplyNumber() > stockSubscribe.getOrderNumber()) {
                     return ServerResponse.createByErrorMsg("The number of applications or the number of wins is the maximum" + stockSubscribe.getOrderNumber());
                 }
@@ -300,7 +382,8 @@
                 model.setAddTime(DateTimeUtil.getCurrentDate());
                 model.setOrderNo(KeyUtils.getUniqueKey());
                 model.setType(stockSubscribe.getType());
-                ret = userStockSubscribeMapper.insert(model);
+                UserStockSubscribeAddIn convert = Convert.convert(UserStockSubscribeAddIn.class, model);
+                return insert(convert,request);
             }
         }
         if(ret>0){
@@ -319,7 +402,7 @@
         if(model!=null){
             //所有人发站内信
             if(model.getUserId() == 0){
-                List<User> users = this.userMapper.listByAdmin(null, null, null, null);
+                List<User> users = this.userMapper.listByAdmin(null, null, null, null,null,null,null,null);
                 for(int k=0;k<users.size();k++){
                     User user = users.get(k);
                     SiteMessage siteMessage = new SiteMessage();
@@ -353,9 +436,9 @@
 
     /*新股申购-查询列表*/
     @Override
-    public ServerResponse<PageInfo> getList(int pageNum, int pageSize, String keyword, HttpServletRequest request){
+    public ServerResponse<PageInfo> getList(int pageNum, int pageSize, String keyword, String agentId,HttpServletRequest request){
         PageHelper.startPage(pageNum, pageSize);
-        List<UserStockSubscribe> listData = this.userStockSubscribeMapper.pageList(pageNum, pageSize, keyword);
+        List<UserStockSubscribe> listData = this.userStockSubscribeMapper.pageList(pageNum, pageSize, keyword,agentId);
         PageInfo pageInfo = new PageInfo(listData);
         pageInfo.setList(listData);
         return ServerResponse.createBySuccess(pageInfo);
@@ -384,8 +467,7 @@
             List<UserStockSubscribe> list = new ArrayList<>();
             for (UserStockSubscribe userStockSubscribe1 : userStockSubscribe) {
                 StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<>(new StockSubscribe())
-                        .eq("code", userStockSubscribe1.getNewCode())
-                        .eq("type",userStockSubscribe1.getType()));
+                        .eq("newlist_id", userStockSubscribe1.getNewStockId()));
                 if (stockSubscribe != null) {
                     list.add(userStockSubscribe1);
                 }
@@ -410,8 +492,6 @@
             }
             UserStockSubscribe userStockSubscribe = userStockSubscribeMapper.load(id);
             if (userStockSubscribe != null && userStockSubscribe.getUserId().equals(user.getId())) {
-                StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<>(new StockSubscribe())
-                        .eq("code", userStockSubscribe.getNewCode()));
                 if(userStockSubscribe.getType()== 2 ){
                     return ServerResponse.createByErrorMsg("未中签,无需支付",request);
                 }

--
Gitblit v1.9.3