From 96e443a77b1d425d3e536c288fc271fe182f1496 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Fri, 18 Jul 2025 18:31:44 +0800
Subject: [PATCH] app股票列表修改

---
 src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java |  350 +++++++++++++++++++++++++++++++---------------------------
 1 files changed, 186 insertions(+), 164 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
index 90ddefa..ee62972 100644
--- a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
@@ -5,6 +5,8 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.nq.Repository.ExchangeRateRepository;
+import com.nq.common.ResponseCode;
 import com.nq.common.ServerResponse;
 import com.nq.dao.StockSubscribeMapper;
 import com.nq.dao.UserAssetsMapper;
@@ -17,11 +19,8 @@
 import com.nq.utils.timeutil.DateTimeUtil;
 import com.nq.utils.KeyUtils;
 import com.nq.utils.PropertiesUtil;
-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 com.nq.vo.subscribe.UserStockSubscribeVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -72,116 +71,124 @@
     @Autowired
     UserAssetsMapper userAssetsMapper;
 
+    @Autowired
+    ExchangeRateRepository exchangeRateRepository;
+
     /**
      * 用户新股申购
      * @param model
      * @return
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     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("newlist_id", model.getNewlistId()));
-            //判断购买新股需不需要密钥
-            if(StringUtils.isNotEmpty(stockSubscribe.getPassword()) && !stockSubscribe.getPassword().equals(model.getPassword())){
-                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);
-            }
+        synchronized (user.getId()){
 
-            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);
-            }
+            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);
+                }
+                //实名认证开关
+                SiteProduct siteProduct = iSiteProductService.getProductSetting();
+                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);
+                }
 
-            BigDecimal sumPrice = stockSubscribe.getPrice().multiply(new BigDecimal(model.getApplyNums()));
-            if(userAssets.getAvailableBalance().compareTo(sumPrice) < 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);
+                }
 
-            Date currentDate = new Date();
-            if(currentDate.before(stockSubscribe.getSubscriptionTime())){
-                return ServerResponse.createByErrorMsg("未开售",request);
-            }
-            if(currentDate.after(stockSubscribe.getSubscribeTime())){
-                return ServerResponse.createByErrorMsg("已结束",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);
+                }
 
 //            //重复申购限制
-//            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);
-            }
+                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()));
+                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);
+                //计算申购金额
+                BigDecimal bound;
+                if (stockSubscribe.getMinPrice() != null && stockSubscribe.getMinPrice().compareTo(BigDecimal.ZERO) > 0) {
+                    bound =  new BigDecimal(model.getApplyNums()).multiply(stockSubscribe.getMinPrice());
                 }else{
-                    userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(userAssets.getAvailableBalance()));
-                    userAssets.setAvailableBalance(BigDecimal.ZERO);
-                    userAssets.setAmountToBeCovered(userAssets.getAmountToBeCovered().add(subtract.abs()));
+                    bound =  new BigDecimal(model.getApplyNums()).multiply(stockSubscribe.getPrice());
                 }
-                userAssetsMapper.updateById(userAssets);
+                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);
 
-                if (ret > 0) {
-                    return ServerResponse.createBySuccessMsg("申购成功",request);
-                } else {
-                    return ServerResponse.createByErrorMsg("申购失败",request);
-                }
-            }else{
+                    //如果不是墨西哥币需要转换金额
+                    if (!stockSubscribe.getStockType().equals(EStockType.MX.getCode())) {
+                        bound = iUserAssetsServices.exchangeAmountByRate(stockSubscribe.getStockType(), bound);
+                    }
+                    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){
@@ -190,30 +197,31 @@
 //                   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);
+                    BigDecimal useEnaAmount = iUserAssetsServices.getAvailableBalance(EStockType.US.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(stockSubscribe.getStockType(), user.getId(),EUserAssets.BUY,bound.negate(),"","");
+                    if (ret > 0) {
+                        return ServerResponse.createBySuccessMsg("配售成功",request);
+                    } else {
+                        return ServerResponse.createByErrorMsg("配售失败",request);
+                    }
                 }
             }
         }
@@ -229,7 +237,7 @@
      * admin 新股申购-添加和修改
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public ServerResponse save(UserStockSubscribe model, HttpServletRequest request) throws Exception {
         int ret = 0;
         if( model.getId() != null  ){
@@ -253,7 +261,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())));
@@ -267,12 +275,20 @@
                         if(applyNumber > 0){
                             //需要退回的资金
                             BigDecimal refundPrice = userStockSubscribe.getBuyPrice().multiply(new BigDecimal(applyNumber));
+                            //如果不是墨西哥币需要转换金额
+                            if (!stockSubscribe.getStockType().equals(EStockType.MX.getCode())) {
+                                refundPrice = iUserAssetsServices.exchangeAmountByRate(stockSubscribe.getStockType(), refundPrice);
+                            }
                             userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(refundPrice));
-                            userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(refundPrice));
+                            userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(refundPrice));
                         }
                     }else{
                         if(applyNumber > 0){
                             BigDecimal refundPrice = userStockSubscribe.getBuyPrice().multiply(new BigDecimal(applyNumber));
+                            //如果不是墨西哥币需要转换金额
+                            if (!stockSubscribe.getStockType().equals(EStockType.MX.getCode())) {
+                                refundPrice = iUserAssetsServices.exchangeAmountByRate(stockSubscribe.getStockType(), refundPrice);
+                            }
                             BigDecimal subtract = refundPrice.subtract(userAssets.getAmountToBeCovered());
                             if(subtract.compareTo(BigDecimal.ZERO) <= 0){//如果退回的资金不足补足待补则直接减
                                 userAssets.setAmountToBeCovered(userAssets.getAmountToBeCovered().subtract(refundPrice));
@@ -293,7 +309,7 @@
                     }
                     BigDecimal cCount = new BigDecimal(model.getApplyNums()-model.getApplyNumber());
                     BigDecimal tMoney = ((stockSubscribe.getMinPrice() != null ? stockSubscribe.getMinPrice() : stockSubscribe.getPrice())).multiply(cCount);
-                    iUserAssetsServices.availablebalanceChange(EStockType.IN.getCode(),userStockSubscribe.getUserId(),
+                    iUserAssetsServices.availablebalanceChange(stockSubscribe.getStockType(),userStockSubscribe.getUserId(),
                             EUserAssets.TOP_UP,tMoney,"","");
                     model.setBond((stockSubscribe.getMinPrice() != null ? stockSubscribe.getMinPrice() : stockSubscribe.getPrice()).multiply(BigDecimal.valueOf(model.getApplyNumber())));
                     model.setDbMoney(BigDecimal.ZERO);
@@ -437,8 +453,7 @@
     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,agentId);
-        PageInfo pageInfo = new PageInfo(listData);
-        pageInfo.setList(listData);
+        PageInfo<UserStockSubscribe> pageInfo = new PageInfo<>(listData);
         return ServerResponse.createBySuccess(pageInfo);
     }
 
@@ -450,20 +465,21 @@
 
     /*新股申购-查询用户最新新股申购数据*/
     @Override
-    public ServerResponse getOneSubscribeByUserId(String type,HttpServletRequest request) {
+    public ServerResponse getOneSubscribeByUserId(String type, Integer status, HttpServletRequest request) {
         String property = PropertiesUtil.getProperty("user.cookie.name");
         String header = request.getHeader(property);
         if (header != null) {
              User user = iUserService.getCurrentRefreshUser(request);
-            List<UserStockSubscribe> userStockSubscribe = null;
-            if (type==null||type.equals("")){
+
+            List<UserStockSubscribeVo> userStockSubscribe = this.userStockSubscribeMapper.getListByParam(user.getId(), type, status);
+            /*if (type==null||type.equals("")){
                 userStockSubscribe = this.userStockSubscribeMapper.selectList(new QueryWrapper<>(new UserStockSubscribe()).eq("user_id", user.getId()).orderByDesc("add_time"));
             }else{
                 userStockSubscribe = this.userStockSubscribeMapper.selectList(new QueryWrapper<>(new UserStockSubscribe()).eq("user_id", user.getId()).eq("type", type).orderByDesc("add_time"));
-            }
+            }*/
 
-            List<UserStockSubscribe> list = new ArrayList<>();
-            for (UserStockSubscribe userStockSubscribe1 : userStockSubscribe) {
+            List<UserStockSubscribeVo> list = new ArrayList<>();
+            for (UserStockSubscribeVo userStockSubscribe1 : userStockSubscribe) {
                 StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<>(new StockSubscribe())
                         .eq("newlist_id", userStockSubscribe1.getNewStockId()));
                 if (stockSubscribe != null) {
@@ -472,51 +488,60 @@
             }
             return ServerResponse.createBySuccess(list);
         }
-        return ServerResponse.createByErrorMsg("请先登录",request);
+        return ServerResponse.createByErrorCodeMsg(ResponseCode.NEED_LOGIN.getCode(),"请先登录");
     }
     /**
      * 新股申购-用户提交金额
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public ServerResponse userSubmit(Integer id,HttpServletRequest request) {
-        int ret = 0;
-        String property = PropertiesUtil.getProperty("user.cookie.name");
-        String header = request.getHeader(property);
-        if (header != null) {
-            User user = iUserService.getCurrentRefreshUser(request);
-            if(id == null){
-                return ServerResponse.createByErrorMsg("参数错误",request);
-            }
-            UserStockSubscribe userStockSubscribe = userStockSubscribeMapper.load(id);
-            if (userStockSubscribe != null && userStockSubscribe.getUserId().equals(user.getId())) {
-                if(userStockSubscribe.getType()== 2 ){
-                    return ServerResponse.createByErrorMsg("未中签,无需支付",request);
+        try {
+            int ret = 0;
+            String property = PropertiesUtil.getProperty("user.cookie.name");
+            String header = request.getHeader(property);
+            if (header != null) {
+                User user = iUserService.getCurrentRefreshUser(request);
+                if(id == null){
+                    return ServerResponse.createByErrorMsg("参数错误",request);
                 }
-                if (userStockSubscribe.getStatus() == 3) {
-                    userStockSubscribe.setSubmitTime(DateTimeUtil.getCurrentDate());
-                    userStockSubscribe.setStatus(4);
-                    BigDecimal bigDecimal =  iUserAssetsServices.
-                            getAvailableBalance(EStockType.IN.getCode(),
-                                    userStockSubscribe.getUserId());
-
-                    BigDecimal multiply = userStockSubscribe.getBuyPrice().multiply(new BigDecimal(userStockSubscribe.getApplyNumber()));
-                    if(bigDecimal.compareTo(multiply) <= 0){
-                        return ServerResponse.createByErrorMsg("余额不足",request);
+                UserStockSubscribe userStockSubscribe = userStockSubscribeMapper.load(id);
+                if (userStockSubscribe != null && userStockSubscribe.getUserId().equals(user.getId())) {
+                    if(userStockSubscribe.getType()== 2 ){
+                        return ServerResponse.createByErrorMsg("未中签,无需支付",request);
                     }
-                    iUserAssetsServices.availablebalanceChange(EStockType.IN.getCode(),userStockSubscribe.getUserId(),
-                            EUserAssets.BUY,multiply.negate(),"","");
-                    userStockSubscribe.setDbMoney(BigDecimal.ZERO);
-                    userStockSubscribeMapper.update1(userStockSubscribe);
-                    return  ServerResponse.createBySuccess();
+                    if (userStockSubscribe.getStatus() == 3) {
+                        StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<>(new StockSubscribe())
+                                .eq("newlist_id", userStockSubscribe.getNewStockId()));
+                        if (stockSubscribe == null) {
+                            return ServerResponse.createByErrorMsg("新股不存在",request);
+                        }
+                        userStockSubscribe.setSubmitTime(DateTimeUtil.getCurrentDate());
+                        userStockSubscribe.setStatus(4);
+                        BigDecimal bigDecimal =  iUserAssetsServices.
+                                getAvailableBalance(EStockType.US.getCode(),
+                                        userStockSubscribe.getUserId());
+
+                        BigDecimal multiply = userStockSubscribe.getBuyPrice().multiply(new BigDecimal(userStockSubscribe.getApplyNumber()));
+                        if(bigDecimal.compareTo(multiply) <= 0){
+                            return ServerResponse.createByErrorMsg("余额不足",request);
+                        }
+                        iUserAssetsServices.availablebalanceChange(stockSubscribe.getStockType(), userStockSubscribe.getUserId(),
+                                EUserAssets.BUY,multiply.negate(),"","");
+                        userStockSubscribe.setDbMoney(BigDecimal.ZERO);
+                        userStockSubscribeMapper.update1(userStockSubscribe);
+                        return  ServerResponse.createBySuccess();
+                    } else {
+                        return ServerResponse.createByErrorMsg("不成功的申请者不收取任何费用",request);
+                    }
                 } else {
-                    return ServerResponse.createByErrorMsg("不成功的申请者不收取任何费用",request);
+                    return ServerResponse.createByErrorMsg("新股认购订单不存在!",request);
                 }
-            } else {
-                return ServerResponse.createByErrorMsg("新股认购订单不存在!",request);
             }
+            return ServerResponse.createByErrorCodeMsg(ResponseCode.NEED_LOGIN.getCode(),"请先登录");
+        } catch (Exception e) {
+            return ServerResponse.createByErrorMsg(e.getMessage());
         }
-        return ServerResponse.createByErrorMsg("请先登录",request);
     }
     /**
      * 新股申购-删除
@@ -536,9 +561,6 @@
         }
         return ServerResponse.createByErrorMsg("Operation failure");
     }
-
-
-
 
 
 }
\ No newline at end of file

--
Gitblit v1.9.3