1

zj

2026-01-15 2818327f844e65e1efc398271b7e4ebf9e8d8364

 src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java

@@ -5,11 +5,10 @@
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.StockSubscribeMapper;
import com.nq.dao.UserAssetsMapper;
import com.nq.dao.UserMapper;
import com.nq.dao.UserStockSubscribeMapper;
import com.nq.dao.*;
import com.nq.enums.EStockType;
import com.nq.enums.EUserAssets;
import com.nq.pojo.*;
@@ -17,24 +16,19 @@
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;
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.*;

/**
 * 新股申购
@@ -61,10 +55,6 @@
    ISiteProductService iSiteProductService;
    @Autowired
    IUserService iUserService;
    @Autowired
    ISiteSettingService iSiteSettingService;
    @Autowired
    TradingHourServiceImpl tradingHourService;

    @Resource
    IUserAssetsServices iUserAssetsServices;
@@ -72,147 +62,167 @@
    @Autowired
    UserAssetsMapper userAssetsMapper;

    @Autowired
    MoneyLogMapper moneyLogMapper;

    @Autowired
    RedisLockService redisLockService;

    /**
     * 用户新股申购
     * @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) {

        // 使用分布式锁
        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()));
            //判断购买新股需不需要密钥
            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);
            }
            UserAssets userAssets =   iUserAssetsServices.assetsByTypeAndUserId(stockSubscribe.getStockType(),user.getId());
            if (model.getNewCode() != null) {
                //判断购买新股需不需要密钥
                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);
                }

            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.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);
            }
//                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);
            }
                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);
            }
            //计算申购金额
            BigDecimal bound;
            if (stockSubscribe.getMinPrice() != null && stockSubscribe.getMinPrice().compareTo(BigDecimal.ZERO) > 0) {
                bound =  new BigDecimal(model.getApplyNums()).multiply(new BigDecimal(stockSubscribe.getLever().toString())).multiply(stockSubscribe.getMinPrice());
            }else{
                bound =  new BigDecimal(model.getApplyNums()).multiply(new BigDecimal(stockSubscribe.getLever().toString())).multiply(stockSubscribe.getPrice());
            }
                //重复申购限制
//                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);
                }

            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);
                model.setApplyNums((int) (model.getApplyNums()*stockSubscribe.getLever()));

                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);
                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);

                if (ret > 0) {
                    return ServerResponse.createBySuccessMsg("申购成功",request);
                } else {
                    return ServerResponse.createByErrorMsg("申购失败",request);
                }
            }else{
                        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 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);
                        if (ret > 0) {
                            return ServerResponse.createBySuccessMsg("申购成功",request);
                        } else {
                            return ServerResponse.createByErrorMsg("申购失败",request);
                        }
                    }else{

                        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);
                        }
                    }
                } catch (DuplicateKeyException e) {
                    return ServerResponse.createByErrorMsg("请勿重复提交", request);
                }
            }
        } finally {
            // 释放锁
            redisLockService.unlock(lockKey, lockValue);
        }
        return ServerResponse.createByErrorMsg("申购失败",request);
    }
@@ -226,8 +236,8 @@
     * admin 新股申购-添加和修改
     */
    @Override
    @Transactional
    public ServerResponse save(UserStockSubscribe model, HttpServletRequest request) {
    @Transactional(rollbackFor = Exception.class)
    public ServerResponse save(UserStockSubscribe model, HttpServletRequest request) throws Exception {
        int ret = 0;
        if( model.getId() != null  ){
            if (model.getStatus() == 3||model.getStatus() == 2) {
@@ -245,15 +255,15 @@
            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);
            }
//            if(model.getStatus() == 3 && model.getApplyNumber()>userStockSubscribe.getApplyNums()){
//                return  ServerResponse.createByErrorMsg("配置中签数量不能超过申请数量",request);
//            }

            //客户中签直接扣除客户账户可用资金
            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())).multiply(new BigDecimal(stockSubscribe.getLever().toString())));
                    model.setBond((stockSubscribe.getMinPrice() != null ? stockSubscribe.getMinPrice() : stockSubscribe.getPrice()).multiply(BigDecimal.valueOf(model.getApplyNumber())));
                    model.setDbMoney(model.getDbMoney());

                    if(null == userAssets){
@@ -262,13 +272,28 @@
                    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().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){//如果退回的资金不足补足待补则直接减
@@ -278,19 +303,33 @@
                                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);
                    iUserPositionService.newStockToPosition(model.getId(),userAssets.getAmountToBeCovered());//转持仓
                    model.setStatus(5);
                    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(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);
@@ -306,54 +345,52 @@
                userAssetsMapper.updateById(userAssets);
                ret = userStockSubscribeMapper.update1(model);
            }else if (model.getStatus() == 5){
                    return iUserPositionService.newStockToPosition(model.getId(),BigDecimal.ZERO);
                return iUserPositionService.newStockToPosition(model.getId(),BigDecimal.ZERO);

            }
                if(ret>0 && model.getStatus() == 3 ){
                    //给用户推送消息
            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());
@@ -379,7 +416,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){
@@ -435,8 +473,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);
    }

@@ -448,73 +485,83 @@

    /*新股申购-查询用户最新新股申购数据*/
    @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("")){
                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) {
                StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<>(new StockSubscribe())
                        .eq("newlist_id", userStockSubscribe1.getNewStockId()));
                if (stockSubscribe != null) {
                    list.add(userStockSubscribe1);
                }
            }
            return ServerResponse.createBySuccess(list);
            List<UserStockSubscribeVo> userStockSubscribe = this.userStockSubscribeMapper.getListByParam(user.getId(), type, status);
            return ServerResponse.createBySuccess(userStockSubscribe);
        }
        return ServerResponse.createByErrorMsg("请先登录",request);
        return ServerResponse.createByErrorCodeMsg(ResponseCode.NEED_LOGIN.getCode(),"请先登录");
    }
    /**
     * 新股申购-用户提交金额
     */

    @Override
    @Transactional
    public ServerResponse userSubmit(Integer id,HttpServletRequest request) {
        int ret = 0;
    public ServerResponse getOneSubscribeByUserIdPage(int pageNum,int pageSize,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);
            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);
                }
                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);
                    }
                    iUserAssetsServices.availablebalanceChange(EStockType.IN.getCode(),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);
            }
            PageHelper.startPage(pageNum, pageSize);
            List<UserStockSubscribeVo> userStockSubscribe = this.userStockSubscribeMapper.getListByParam(user.getId(), type, status);
            PageInfo<UserStockSubscribeVo>  pageInfo = new PageInfo<>(userStockSubscribe);
            return ServerResponse.createBySuccess(pageInfo);
        }
        return ServerResponse.createByErrorMsg("请先登录",request);
        return ServerResponse.createByErrorCodeMsg(ResponseCode.NEED_LOGIN.getCode(),"请先登录");
    }

    /**
     * 新股申购-用户提交金额
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public ServerResponse userSubmit(Integer id,HttpServletRequest 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);
                }
                UserStockSubscribe userStockSubscribe = userStockSubscribeMapper.load(id);
                if (userStockSubscribe != null && userStockSubscribe.getUserId().equals(user.getId())) {
                    if(userStockSubscribe.getType()== 2 ){
                        return ServerResponse.createByErrorMsg("未中签,无需支付",request);
                    }
                    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.createByErrorCodeMsg(ResponseCode.NEED_LOGIN.getCode(),"请先登录");
        } catch (Exception e) {
            return ServerResponse.createByErrorMsg(e.getMessage());
        }
    }
    /**
     * 新股申购-删除
@@ -534,9 +581,6 @@
        }
        return ServerResponse.createByErrorMsg("Operation failure");
    }





}