From 2818327f844e65e1efc398271b7e4ebf9e8d8364 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 15 Jan 2026 18:44:53 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java |  537 +++++++++++++++++++++++++++++------------------------------
 1 files changed, 264 insertions(+), 273 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
index f3f21f4..15df013 100644
--- a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.nq.common.RedisLockService;
 import com.nq.common.ResponseCode;
 import com.nq.common.ServerResponse;
 import com.nq.dao.*;
@@ -20,16 +21,14 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * 新股申购
@@ -66,6 +65,9 @@
     @Autowired
     MoneyLogMapper moneyLogMapper;
 
+    @Autowired
+    RedisLockService redisLockService;
+
     /**
      * 用户新股申购
      * @param model
@@ -79,14 +81,21 @@
             return ServerResponse.createByErrorMsg("参数错误",request);
         }
         User user = iUserService.getCurrentRefreshUser(request);
-        synchronized (user.getId()){
 
+        // 使用分布式锁
+        String lockKey = "subscribe:lock:" + user.getId();
+        String lockValue = UUID.randomUUID().toString(); // 生成唯一值
+
+        // 尝试获取锁,设置5秒过期时间
+        boolean locked = redisLockService.tryLock(lockKey, lockValue, 5);
+        if (!locked) {
+            return ServerResponse.createByErrorMsg("请求处理中,请勿重复提交", request);
+        }
+        try {
+            StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<StockSubscribe>()
+                    .eq("newlist_id", model.getNewlistId()));
+            UserAssets userAssets =   iUserAssetsServices.assetsByTypeAndUserId(stockSubscribe.getStockType(),user.getId());
             if (model.getNewCode() != null) {
-                StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<StockSubscribe>()
-                        .eq("newlist_id", model.getNewlistId()));
-                if (stockSubscribe == null) {
-                    return ServerResponse.createByErrorMsg("新的股票代码不存在",request);
-                }
                 //判断购买新股需不需要密钥
                 if(StringUtils.isNotEmpty(stockSubscribe.getPassword()) && !stockSubscribe.getPassword().equals(model.getPassword())){
                     return ServerResponse.createByErrorMsg("密钥输入错误",request);
@@ -96,7 +105,6 @@
                 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);
                 }
@@ -112,10 +120,10 @@
                     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);
-                }*/
+//                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())){
@@ -125,14 +133,17 @@
                     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);
-                }
+                //重复申购限制
+//                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()));
@@ -144,95 +155,74 @@
                 }else{
                     bound =  new BigDecimal(model.getApplyNums()).multiply(stockSubscribe.getPrice());
                 }
-                //如果不是默认货币需要转换金额
-                if (!stockSubscribe.getStockType().equals(EStockType.getDefault().getCode())) {
-                    bound = iUserAssetsServices.exchangeAmountByRate(stockSubscribe.getStockType(), bound);
-                }
-                if(userAssets.getAvailableBalance().compareTo(bound) < 0){
-                    return ServerResponse.createByErrorMsg("账户余额不足", request);
-                }
+                try{
+                    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);
 
-                String before = userAssets.getAvailableBalance().toString();
-                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);
 
-                    BigDecimal subtract = userAssets.getAvailableBalance().subtract(bound);
-                    if(subtract.compareTo(BigDecimal.ZERO) >= 0){
-                        userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(bound));
-                        userAssets.setAvailableBalance(subtract);
+                        if (ret > 0) {
+                            return ServerResponse.createBySuccessMsg("申购成功",request);
+                        } else {
+                            return ServerResponse.createByErrorMsg("申购失败",request);
+                        }
                     }else{
-                        userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(userAssets.getAvailableBalance()));
-                        userAssets.setAvailableBalance(BigDecimal.ZERO);
-                        userAssets.setAmountToBeCovered(userAssets.getAmountToBeCovered().add(subtract.abs()));
-                    }
-                    userAssetsMapper.updateById(userAssets);
-                    //交易记录MEX
-                    MoneyLog moneyLog = new MoneyLog();
-                    EUserAssets eUserAssets = EUserAssets.BUY;
-                    moneyLog.setDescs(eUserAssets.getDesc());
-                    moneyLog.setBeFore(before);
-                    moneyLog.setAfter(userAssets.getAvailableBalance().toString());
-                    moneyLog.setAmount(bound.negate().toString());
-                    moneyLog.setAccectType(EStockType.getDefault().getCode());
-                    moneyLog.setType(eUserAssets.getCode());
-                    moneyLog.setUserId(user.getId()+"");
-                    moneyLog.setSymbol(EStockType.getDefault().getSymbol());
-                    moneyLog.setCreateTime(new Date());
-                    moneyLogMapper.insert(moneyLog);
-                    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.US.getCode(), user.getId());
-                    if(useEnaAmount.compareTo(bound)<0){
-                        return ServerResponse.createByErrorMsg("余额不足,配售失败",request);
+                        BigDecimal useEnaAmount = iUserAssetsServices.getAvailableBalance(stockSubscribe.getStockType(), 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);
+                        }
                     }
-                    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);
-                    }
+                } catch (DuplicateKeyException e) {
+                    return ServerResponse.createByErrorMsg("请勿重复提交", request);
                 }
             }
+        } finally {
+            // 释放锁
+            redisLockService.unlock(lockKey, lockValue);
         }
         return ServerResponse.createByErrorMsg("申购失败",request);
     }
@@ -247,192 +237,193 @@
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ServerResponse save(UserStockSubscribe model, HttpServletRequest request){
-        try {
-            int ret = 0;
-            if( model.getId() != null){
-                if (model.getStatus() == 3||model.getStatus() == 2) {
-                    model.setEndTime(DateTimeUtil.getCurrentDate());
-                }
-                UserStockSubscribe userStockSubscribe = userStockSubscribeMapper.load(model.getId());
-                if (userStockSubscribe.getStatus() == 5) {
-                    return ServerResponse.createByErrorMsg("It's been converted");
-                }
-                if(userStockSubscribe.getStatus() == 3){
-                    return ServerResponse.createByErrorMsg("不能更改申购状态");
-                }
-                StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<>(new StockSubscribe())
-                        .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);
-                }
+    public ServerResponse save(UserStockSubscribe model, HttpServletRequest request) throws Exception {
+        int ret = 0;
+        if( model.getId() != null  ){
+            if (model.getStatus() == 3||model.getStatus() == 2) {
+                model.setEndTime(DateTimeUtil.getCurrentDate());
+            }
+            UserStockSubscribe userStockSubscribe = userStockSubscribeMapper.load(model.getId());
+            if (userStockSubscribe.getStatus() == 5) {
+                return ServerResponse.createByErrorMsg("It's been converted");
+            }
+            if(userStockSubscribe.getStatus() == 3){
+                return ServerResponse.createByErrorMsg("不能更改申购状态");
+            }
+            StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<>(new StockSubscribe())
+                    .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(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())));
-                        model.setDbMoney(model.getDbMoney());
+            //客户中签直接扣除客户账户可用资金
+            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())));
+                    model.setDbMoney(model.getDbMoney());
 
-                        if(null == userAssets){
-                            return ServerResponse.createByErrorMsg("客户资金账户不存在");
-                        }
-                        int applyNumber = userStockSubscribe.getApplyNums() - model.getApplyNumber();
-                        BigDecimal refundPrice = BigDecimal.ZERO;
-                        String before = userAssets.getAvailableBalance().toString();
-                        if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) <= 0){
-                            if(applyNumber > 0){
-                                //需要退回的资金
-                                refundPrice = userStockSubscribe.getBuyPrice().multiply(new BigDecimal(applyNumber));
-                                //如果不是默认货币需要转换金额
-                                if (!stockSubscribe.getStockType().equals(EStockType.getDefault().getCode())) {
-                                    refundPrice = iUserAssetsServices.exchangeAmountByRate(stockSubscribe.getStockType(), refundPrice);
-                                }
-                                userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(refundPrice));
-                                userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(refundPrice));
-                            }
-                        }else{
-                            if(applyNumber > 0){
-                                refundPrice = userStockSubscribe.getBuyPrice().multiply(new BigDecimal(applyNumber));
-                                //如果不是默认货币需要转换金额
-                                if (!stockSubscribe.getStockType().equals(EStockType.getDefault().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));
-                                }else{//如果退回的资金足够填补待补资金还有剩余,则返回余额
-                                    userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(refundPrice).add(userAssets.getAmountToBeCovered()));
-                                    userAssets.setAmountToBeCovered(BigDecimal.ZERO);
-                                    userAssets.setAvailableBalance(subtract);
-                                }
-                            }
-                        }
-                        //如果退回资金 add交易记录MEX
-                        if (refundPrice.compareTo(BigDecimal.ZERO) > 0) {
-                            MoneyLog moneyLog = new MoneyLog();
-                            EUserAssets eUserAssets = EUserAssets.BUY_RT;
-                            moneyLog.setDescs(eUserAssets.getDesc());
-                            moneyLog.setBeFore(before);
-                            moneyLog.setAfter(userAssets.getAvailableBalance().toString());
-                            moneyLog.setAmount(refundPrice.toString());
-                            moneyLog.setAccectType(EStockType.getDefault().getCode());
-                            moneyLog.setType(eUserAssets.getCode());
-                            moneyLog.setUserId(userAssets.getUserId()+"");
-                            moneyLog.setSymbol(EStockType.getDefault().getSymbol());
-                            moneyLog.setCreateTime(new Date());
-                            moneyLogMapper.insert(moneyLog);
-                        }
-                        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.getMinPrice() != null ? stockSubscribe.getMinPrice() : stockSubscribe.getPrice())).multiply(cCount);
-                        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);
-                        model.setStatus(4);
-                        ret = userStockSubscribeMapper.update1(model);
+                    if(null == userAssets){
+                        return ServerResponse.createByErrorMsg("客户资金账户不存在");
                     }
-                }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);
+                    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 if(applyNumber < 0){
+                            //中签数量 > 申购数量,只能从可用余额扣除
+                            BigDecimal additionalAmount = userStockSubscribe.getBuyPrice().multiply(new BigDecimal(-applyNumber));
+                            if(userAssets.getAvailableBalance().compareTo(additionalAmount) >= 0){
+                                // 可用余额足够,扣除可用余额,增加冻结资金
+                                userAssets.setAvailableBalance(userAssets.getAvailableBalance().subtract(additionalAmount));
+                                userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(additionalAmount));
+                            } else {
+                                // 可用余额不足,全部扣除,差额增加到待补资金,冻结资金增加可用余额的金额
+                                BigDecimal shortage = additionalAmount.subtract(userAssets.getAvailableBalance());
+                                userAssets.setAmountToBeCovered(userAssets.getAmountToBeCovered().add(shortage));
+                                userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(userAssets.getAvailableBalance()));
+                                userAssets.setAvailableBalance(BigDecimal.ZERO);
+                            }
+                        }
+                    }else{
+                        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);
+                            }
+                        } else if(applyNumber < 0){
+                            //中签数量 > 申购数量,只能从可用余额扣除
+                            BigDecimal additionalAmount = userStockSubscribe.getBuyPrice().multiply(new BigDecimal(-applyNumber));
+                            if(userAssets.getAvailableBalance().compareTo(additionalAmount) >= 0){
+                                // 可用余额足够,扣除可用余额,增加冻结资金
+                                userAssets.setAvailableBalance(userAssets.getAvailableBalance().subtract(additionalAmount));
+                                userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(additionalAmount));
+                            } else {
+                                // 可用余额不足,全部扣除,差额增加到待补资金,冻结资金增加可用余额的金额
+                                BigDecimal shortage = additionalAmount.subtract(userAssets.getAvailableBalance());
+                                userAssets.setAmountToBeCovered(userAssets.getAmountToBeCovered().add(shortage));
+                                userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(userAssets.getAvailableBalance()));
+                                userAssets.setAvailableBalance(BigDecimal.ZERO);
+                            }
+                        }
+                    }
                     ret = userStockSubscribeMapper.update1(model);
-                }else if (model.getStatus() == 5){
-                    return iUserPositionService.newStockToPosition(model.getId(),BigDecimal.ZERO);
-
+                    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.getMinPrice() != null ? stockSubscribe.getMinPrice() : stockSubscribe.getPrice())).multiply(cCount);
+                    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);
+                    model.setStatus(4);
+                    ret = userStockSubscribeMapper.update1(model);
                 }
-                if(ret>0 && model.getStatus() == 3 ){
-                    //给用户推送消息
+            }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(),BigDecimal.ZERO);
+
+            }
+            if(ret>0 && model.getStatus() == 3 ){
+                //给用户推送消息
+                SiteMessage siteMessage = new SiteMessage();
+                siteMessage.setUserId(userStockSubscribe.getUserId());
+                siteMessage.setUserName(userStockSubscribe.getRealName());
+                siteMessage.setTypeName("New share subscription");
+                siteMessage.setStatus(1);
+
+                siteMessage.setAddTime(DateTimeUtil.getCurrentDate());
+
+
+                if (stockSubscribe.getType() == 2){
+                    siteMessage.setContent("【新股申购中签】恭喜您,新股申购中签成功,申购金额:"+ userStockSubscribe.getBond() +"请及时关注哦。");
+                }else {
+                    siteMessage.setContent("【新股申购中签】恭喜您,新股申购中签成功,申购金额:" + userStockSubscribe.getBond() + ",请及时关注哦。");
+                }
+                iSiteMessageService.insert(siteMessage);
+            }else
+            if(ret>0 && model.getStatus() == 2) {
+                //给达到消息强平提醒用户推送消息
+                if (stockSubscribe.getType() != 2) {
                     SiteMessage siteMessage = new SiteMessage();
                     siteMessage.setUserId(userStockSubscribe.getUserId());
                     siteMessage.setUserName(userStockSubscribe.getRealName());
-                    siteMessage.setTypeName("New share subscription");
+                    siteMessage.setTypeName("新股申购");
                     siteMessage.setStatus(1);
-
+                    siteMessage.setContent("【新股申购未中签】很遗憾,您的新股申购本次未中签,申购金额:" + userStockSubscribe.getBond() + "。");
                     siteMessage.setAddTime(DateTimeUtil.getCurrentDate());
-
-
-                    if (stockSubscribe.getType() == 2){
-                        siteMessage.setContent("【新股申购中签】恭喜您,新股申购中签成功,申购金额:"+ userStockSubscribe.getBond() +"请及时关注哦。");
-                    }else {
-                        siteMessage.setContent("【新股申购中签】恭喜您,新股申购中签成功,申购金额:" + userStockSubscribe.getBond() + ",请及时关注哦。");
-                    }
                     iSiteMessageService.insert(siteMessage);
-                }else
-                if(ret>0 && model.getStatus() == 2) {
-                    //给达到消息强平提醒用户推送消息
-                    if (stockSubscribe.getType() != 2) {
-                        SiteMessage siteMessage = new SiteMessage();
-                        siteMessage.setUserId(userStockSubscribe.getUserId());
-                        siteMessage.setUserName(userStockSubscribe.getRealName());
-                        siteMessage.setTypeName("新股申购");
-                        siteMessage.setStatus(1);
-                        siteMessage.setContent("【新股申购未中签】很遗憾,您的新股申购本次未中签,申购金额:" + userStockSubscribe.getBond() + "。");
-                        siteMessage.setAddTime(DateTimeUtil.getCurrentDate());
-                        iSiteMessageService.insert(siteMessage);
-                    }else {
-                        User user = userMapper.selectById(userStockSubscribe.getUserId());
-                        userMapper.updateByPrimaryKey(user);
-                        SiteMessage siteMessage = new SiteMessage();
-                        siteMessage.setUserId(userStockSubscribe.getUserId());
-                        siteMessage.setUserName(userStockSubscribe.getRealName());
-                        siteMessage.setTypeName("新股申购");
-                        siteMessage.setStatus(1);
-                        siteMessage.setContent("【新股申购未中签】很遗憾,您的新股申购本次未中签,申购金额:" + userStockSubscribe.getBond() + "已退还。");
-                        siteMessage.setAddTime(DateTimeUtil.getCurrentDate());
-                        iSiteMessageService.insert(siteMessage);
-                    }
-
+                }else {
+                    User user = userMapper.selectById(userStockSubscribe.getUserId());
+                    userMapper.updateByPrimaryKey(user);
+                    SiteMessage siteMessage = new SiteMessage();
+                    siteMessage.setUserId(userStockSubscribe.getUserId());
+                    siteMessage.setUserName(userStockSubscribe.getRealName());
+                    siteMessage.setTypeName("新股申购");
+                    siteMessage.setStatus(1);
+                    siteMessage.setContent("【新股申购未中签】很遗憾,您的新股申购本次未中签,申购金额:" + userStockSubscribe.getBond() + "已退还。");
+                    siteMessage.setAddTime(DateTimeUtil.getCurrentDate());
+                    iSiteMessageService.insert(siteMessage);
                 }
-            } else{
-                if(model.getPhone() != null&&model.getId()==null) {
-                    User user = userMapper.findByPhone(model.getPhone());
-                    if (user == null) {
-                        return ServerResponse.createByErrorMsg("User does not exist");
-                    }
-                    model.setRealName(user.getRealName());
-                    model.setUserId(user.getId());
-                    model.setAgentId(user.getAgentId());
-                    model.setAgentName(user.getAgentName());
-                    StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<>(new StockSubscribe())
-                            .eq("newlist_id", model.getNewStockId()));
-                    if (stockSubscribe == null) {
-                        return ServerResponse.createByErrorMsg("Failed. Ipo information does not exist");
-                    }
 
-                    model.setNewName(stockSubscribe.getName());
-                    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());
-                    }
-                    model.setBond(model.getBuyPrice().multiply(BigDecimal.valueOf(model.getApplyNumber())));
-                    model.setAddTime(DateTimeUtil.getCurrentDate());
-                    model.setOrderNo(KeyUtils.getUniqueKey());
-                    model.setType(stockSubscribe.getType());
-                    UserStockSubscribeAddIn convert = Convert.convert(UserStockSubscribeAddIn.class, model);
-                    return insert(convert,request);
+            }
+        } else{
+            if(model.getPhone() != null&&model.getId()==null) {
+                User user = userMapper.findByPhone(model.getPhone());
+                if (user == null) {
+                    return ServerResponse.createByErrorMsg("User does not exist");
                 }
+                model.setRealName(user.getRealName());
+                model.setUserId(user.getId());
+                model.setAgentId(user.getAgentId());
+                model.setAgentName(user.getAgentName());
+                StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<>(new StockSubscribe())
+                        .eq("newlist_id", model.getNewStockId()));
+                if (stockSubscribe == null) {
+                    return ServerResponse.createByErrorMsg("Failed. Ipo information does not exist");
+                }
+
+                model.setNewName(stockSubscribe.getName());
+                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());
+                }
+                model.setBond(model.getBuyPrice().multiply(BigDecimal.valueOf(model.getApplyNumber())));
+                model.setAddTime(DateTimeUtil.getCurrentDate());
+                model.setOrderNo(KeyUtils.getUniqueKey());
+                model.setType(stockSubscribe.getType());
+                UserStockSubscribeAddIn convert = Convert.convert(UserStockSubscribeAddIn.class, model);
+                return insert(convert,request);
             }
-            if(ret>0){
-                return ServerResponse.createBySuccessMsg("Successful operation");
-            }
-        } catch (Exception e) {
-            log.error(e.getMessage(),e);
         }
+        if(ret>0){
+            return ServerResponse.createBySuccessMsg("Successful operation");
+        }
+
         return ServerResponse.createByErrorMsg("Operation failure");
     }
     /**

--
Gitblit v1.9.3