From 76388afc59b66335dcf630e5ed30beccbe7aeb5b Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Thu, 28 Aug 2025 17:29:05 +0800
Subject: [PATCH] 新股修改

---
 src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java |  664 ++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 412 insertions(+), 252 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
index 0fb782a..0d3aeb4 100644
--- a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
@@ -1,21 +1,22 @@
 package com.nq.service.impl;
 
 
+import cn.hutool.core.convert.Convert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.nq.common.ResponseCode;
 import com.nq.common.ServerResponse;
-import com.nq.dao.StockSubscribeMapper;
-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.*;
 import com.nq.service.*;
 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.nq.vo.subscribe.UserStockSubscribeVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,12 +43,12 @@
     @Resource
     private UserStockSubscribeMapper userStockSubscribeMapper;
 
-    @Autowired
+    @Resource
     UserMapper userMapper;
 
     @Autowired
     ISiteMessageService iSiteMessageService;
-    @Autowired
+    @Resource
     StockSubscribeMapper stockSubscribeMapper;
     @Autowired
     IUserPositionService iUserPositionService;
@@ -55,106 +56,201 @@
     ISiteProductService iSiteProductService;
     @Autowired
     IUserService iUserService;
+
+    @Resource
+    IUserAssetsServices iUserAssetsServices;
+
     @Autowired
-    ISiteSettingService iSiteSettingService;
+    UserAssetsMapper userAssetsMapper;
+
     @Autowired
-    TradingHourServiceImpl tradingHourService;
+    MoneyLogMapper moneyLogMapper;
+
     /**
      * 用户新股申购
      * @param model
      * @return
      */
     @Override
-    public ServerResponse insert(UserStockSubscribe model, HttpServletRequest request) throws Exception {
+    @Transactional(rollbackFor = Exception.class)
+    public ServerResponse insert(UserStockSubscribeAddIn model, HttpServletRequest request) throws Exception {
         int ret = 0;
         if (model == null) {
-            return ServerResponse.createByErrorMsg("Parameter error");
+            return ServerResponse.createByErrorMsg("参数错误",request);
         }
-        String property = PropertiesUtil.getProperty("user.cookie.name");
-        String header = request.getHeader(property);
-        if (header != null) {
-            User user = this.iUserService.getCurrentRefreshUser(request);
-            if (user == null){
-                return ServerResponse.createBySuccessMsg("請先登錄");
-            }
+        User user = iUserService.getCurrentRefreshUser(request);
+        synchronized (user.getId()){
+
             if (model.getNewCode() != null) {
-                StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<StockSubscribe>().eq("code", model.getNewCode()));
+                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);
+                }
                 //实名认证开关
                 SiteProduct siteProduct = iSiteProductService.getProductSetting();
-                if (siteProduct.getRealNameDisplay() && (StringUtils.isBlank(user.getRealName()) || StringUtils.isBlank(user.getIdCard()))) {
-                    return ServerResponse.createByErrorMsg("Order failed, please first real name authentication");
+                if (siteProduct.getRealNameDisplay() && user.getIsActive() != 2) {
+                    return ServerResponse.createByErrorMsg("订单失败,请先实名认证",request);
                 }
-//                //判断休息日不能买入
-//                if (siteProduct.getHolidayDisplay()) {
-//                    return ServerResponse.createByErrorMsg("No trading on weekends or holidays!");
-//                }
-                //判断股票是否在可交易时间段
-                Boolean b = tradingHourService.timeCheck();
-                if (b) {
-                    return ServerResponse.createByErrorMsg("Order failed, not in the  stock trading session");
+                UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId(stockSubscribe.getStockType(), user.getId());
+                if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
+                    return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
                 }
-                //重复申购限制
-                UserStockSubscribe userStockSubscribe = userStockSubscribeMapper.selectOne(new QueryWrapper<UserStockSubscribe>().eq("new_code", model.getNewCode()).eq("user_id", user.getId()));
-                if (userStockSubscribe != null) {
-                    return ServerResponse.createByErrorMsg("请勿重复申购");
-                }
-                if (siteProduct.getRealNameDisplay() && user.getIsLock().intValue() == 1) {
-                    return ServerResponse.createByErrorMsg("Order failed, account has been locked");
-                }
-                if (stockSubscribe == null) {
-                    return ServerResponse.createByErrorMsg("The new stock code does not exist");
-                }
-//                //时间判定当前时间是否是申购时间
-//                SiteSetting siteSetting = this.iSiteSettingService.getSiteSetting();
-//                if (siteSetting == null) {
-//                    log.error("下单出错,网站设置表不存在");
-//                    return ServerResponse.createByErrorMsg("Order failed, system setting error");
-//                }
-//                String am_begin = siteSetting.getTransAmBegin();
-//                String am_end = siteSetting.getTransAmEnd();
-//                String pm_begin = siteSetting.getTransPmBegin();
-//                String pm_end = siteSetting.getTransPmEnd();
-//                boolean am_flag = BuyAndSellUtils.isTransTime(am_begin, am_end);
-//                boolean pm_flag = BuyAndSellUtils.isTransTime(pm_begin, pm_end);
-//                log.info("是否在上午交易时间 = {} 是否在下午交易时间 = {}", Boolean.valueOf(am_flag), Boolean.valueOf(pm_flag));
-//                if (!am_flag && !pm_flag) {
-//                    return ServerResponse.createByErrorMsg("Application failed, not in the trading session");
-//                }
-//                //时间判定当前时间是否是申购时间
-//                if (stockSubscribe.getSubscribeTime().getTime() < System.currentTimeMillis()) {
-//                    return ServerResponse.createByErrorMsg("The application time has passed");
-//                }
 
-                if (model.getApplyNums() == null || model.getApplyNums() > stockSubscribe.getOrderNumber()|| model.getApplyNums() < 500) {
-                    return ServerResponse.createByErrorMsg("The minimum purchase quantity is 500, the maximum is large" + stockSubscribe.getOrderNumber());
+                if ( model.getApplyNums() == null){
+                    // 申请数量为空时返回错误信息
+                    return ServerResponse.createByErrorMsg("申请数量不能为空", request);
                 }
-                if (stockSubscribe.getType() == 2) {
-                    int u = userMapper.updateById(user);
-                    if (u <= 0) {
-                        return ServerResponse.createByErrorMsg("Application failed due to unknown reasons");
+
+                //用户是否杠杆
+                boolean isLever = model.getLever() != null && model.getLever().intValue() > 0;
+                if (isLever) {
+                    model.setApplyNums(model.getApplyNums() * model.getLever().intValue());
+                } else {
+                    model.setApplyNums(model.getApplyNums() * stockSubscribe.getLever().intValue());
+                }
+
+                if(model.getApplyNums() < stockSubscribe.getMinNumber() ){
+                    return ServerResponse.createByErrorMsg("最少申购:" + stockSubscribe.getMinNumber(), request);
+                }
+                if (model.getApplyNums() > stockSubscribe.getOrderNumber()){
+                    return ServerResponse.createByErrorMsg("最多可申购:" + stockSubscribe.getOrderNumber(), request);
+                }
+
+                /*BigDecimal sumPrice = stockSubscribe.getPrice().multiply(new BigDecimal(model.getApplyNums()));
+                if(userAssets.getAvailableBalance().compareTo(sumPrice) < 0){
+                    return ServerResponse.createByErrorMsg("账户余额不足", request);
+                }*/
+
+                Date currentDate = new Date();
+                if(currentDate.before(stockSubscribe.getSubscriptionTime())){
+                    return ServerResponse.createByErrorMsg("未开售",request);
+                }
+                if(currentDate.after(stockSubscribe.getSubscribeTime())){
+                    return ServerResponse.createByErrorMsg("已结束",request);
+                }
+
+//            //重复申购限制
+                /*Long count = userStockSubscribeMapper.selectCount(new QueryWrapper<UserStockSubscribe>().eq(
+                        "new_code", model.getNewCode()).eq("user_id", user.getId()).eq("type", model.getType()));
+                if (count > 0) {
+                    return ServerResponse.createByErrorMsg("请勿重复申请",request);
+                }*/
+                if (siteProduct.getRealNameDisplay() && user.getIsLock().intValue() == 1) {
+                    return ServerResponse.createByErrorMsg("订单失败,帐户已被锁定",request);
+                }
+
+                //计算申购金额
+                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.getStockType().equals(EStockType.getDefault().getCode())) {
+                    bound = iUserAssetsServices.exchangeAmountByRate(stockSubscribe.getStockType(), bound);
+                }*/
+
+                //需要资金
+                /*BigDecimal needBound;
+                //杠杆账户只需初始数量资金
+                if (isLever) {
+                    needBound = bound.divide(new BigDecimal(model.getLever()));
+                } else {
+                    needBound = bound;
+                }
+                if(userAssets.getAvailableBalance().compareTo(needBound) < 0){
+                    return ServerResponse.createByErrorMsg("账户余额不足", request);
+                }
+                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);
+                    //交易记录
+                    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(stockSubscribe.getStockType());
+                    moneyLog.setType(eUserAssets.getCode());
+                    moneyLog.setUserId(user.getId()+"");
+                    moneyLog.setSymbol(EStockType.getEStockTypeByCode(stockSubscribe.getStockType()).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(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.getPrice());
-                model.setBond(new BigDecimal(model.getApplyNums()).multiply(stockSubscribe.getPrice()));
-                model.setRealName(Objects.equals(user.getRealName(), "")||user.getRealName()==null ?"模拟用户无实名":user.getRealName());
-                model.setAddTime(new Date());
-                model.setOrderNo(KeyUtils.getUniqueKey());
-                model.setType(stockSubscribe.getType());
-            }
-
-            ret = userStockSubscribeMapper.insert(model);
-            if (ret > 0) {
-                return ServerResponse.createBySuccessMsg("Successful application");
-            } else {
-                return ServerResponse.createByErrorMsg("Application failure");
             }
         }
-        return ServerResponse.createByErrorMsg("Not logged in");
+        return ServerResponse.createByErrorMsg("申购失败",request);
     }
     @Override
     public int update(UserStockSubscribe model) {
@@ -166,36 +262,142 @@
      * admin 新股申购-添加和修改
      */
     @Override
-    public ServerResponse save(UserStockSubscribe model, HttpServletRequest request) {
-        int ret = 0;
-//        log.info("model"+model);
-        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");
-            }
-//            else if (userStockSubscribe.getStatus() == 3) {
-//                return ServerResponse.createByErrorMsg("已经审核过并且中签了,无法再次更改状态");
-//            }else if (userStockSubscribe.getStatus() == 2) {
-//                return ServerResponse.createByErrorMsg("已经审核过并且未中签");
-//            }
-            StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<>(new StockSubscribe()).eq("code", userStockSubscribe.getNewCode()));
-            if (model.getStatus() == 3 && model.getApplyNumber() != null){
-                if(stockSubscribe.getOrderNumber()< model.getApplyNumber()){
-                    return ServerResponse.createByErrorMsg("The number of successful applications exceeds the maximum number of applications");
+    @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());
                 }
-                model.setBond(stockSubscribe.getPrice().multiply(BigDecimal.valueOf(model.getApplyNumber())));
-                ret = userStockSubscribeMapper.update1(model);
-            }else if (model.getStatus() == 2){
-                ret = userStockSubscribeMapper.update1(model);
-            }else if (model.getStatus() == 5){
-                    return iUserPositionService.newStockToPosition(model.getId());
+                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){
+                        BigDecimal bound;
+                        if(stockSubscribe.getMinPrice() != null && stockSubscribe.getMinPrice().compareTo(BigDecimal.ZERO) > 0) {
+                           bound =  new BigDecimal(model.getApplyNumber()).multiply(stockSubscribe.getMinPrice());
+                        }else{
+                           bound =  new BigDecimal(model.getApplyNumber()).multiply(stockSubscribe.getPrice());
+                        }
+                        model.setBond(bound);
+                        model.setDbMoney(model.getDbMoney());
 
+                        if(null == userAssets){
+                            return ServerResponse.createByErrorMsg("客户资金账户不存在");
+                        }
+                        String before = userAssets.getAvailableBalance().toString();
+                        BigDecimal subtract = userAssets.getAvailableBalance().subtract(bound);
+                        if(subtract.compareTo(BigDecimal.ZERO) >= 0){
+                            userAssets.setAvailableBalance(subtract);
+                        }else{
+                            userAssets.setAvailableBalance(BigDecimal.ZERO);
+                            userAssets.setAmountToBeCovered(userAssets.getAmountToBeCovered().add(subtract.abs()));
+                        }
+                        //交易记录
+                        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(stockSubscribe.getStockType());
+                        moneyLog.setType(eUserAssets.getCode());
+                        moneyLog.setUserId(userStockSubscribe.getUserId()+"");
+                        moneyLog.setSymbol(EStockType.getEStockTypeByCode(stockSubscribe.getStockType()).getSymbol());
+                        moneyLog.setCreateTime(new Date());
+                        moneyLogMapper.insert(moneyLog);
+
+//                        BigDecimal refundPrice = BigDecimal.ZERO;
+//                        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(stockSubscribe.getStockType());
+//                            moneyLog.setType(eUserAssets.getCode());
+//                            moneyLog.setUserId(userAssets.getUserId()+"");
+//                            moneyLog.setSymbol(EStockType.getEStockTypeByCode(stockSubscribe.getStockType()).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);
+                    }
+                }else if (model.getStatus() == 2){
+                    if(stockSubscribe.getType() == 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();
@@ -208,19 +410,8 @@
 
 
                     if (stockSubscribe.getType() == 2){
-                        User user = userMapper.selectById(userStockSubscribe.getUserId());
-                        UserStockSubscribe userStockSubscribe1 = userStockSubscribeMapper.load(model.getId());
-                        int refundenum = userStockSubscribe1.getApplyNums() - model.getApplyNumber();
-//                        log.info("refundenum"+refundenum);
-                        Integer refund =refundenum * stockSubscribe.getPrice().intValue();
-//                        log.info("退还金额"+refund);
-                       int ret1 = userMapper.updateByPrimaryKey(user);
-                       if (ret1 <= 0) {
-                                return ServerResponse.createByErrorMsg("Application failed due to unknown reasons");
-                            }
-                        siteMessage.setContent("【新股申购中签】恭喜您,新股申购中签成功,申购金额:"+ userStockSubscribe.getBond() +"退还"+refund+",请及时关注哦。");
+                        siteMessage.setContent("【新股申购中签】恭喜您,新股申购中签成功,申购金额:"+ userStockSubscribe.getBond() +"请及时关注哦。");
                     }else {
-
                         siteMessage.setContent("【新股申购中签】恭喜您,新股申购中签成功,申购金额:" + userStockSubscribe.getBond() + ",请及时关注哦。");
                     }
                     iSiteMessageService.insert(siteMessage);
@@ -250,48 +441,43 @@
                     }
 
                 }
+            } 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");
+                    }
 
-
-        } 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.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);
                 }
-                model.setRealName(user.getRealName());
-                model.setUserId(user.getId());
-                model.setAgentId(user.getAgentId());
-                model.setAgentName(user.getAgentName());
-
-
-//            String cookie_name = PropertiesUtil.getProperty("admin.cookie.name");
-//            String logintoken = CookieUtils.readLoginToken(request, cookie_name);
-//            String adminJson = RedisShardedPoolUtils.get(logintoken);
-//            SiteAdmin siteAdmin = (SiteAdmin) JsonUtil.string2Obj(adminJson, SiteAdmin.class);
-                StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<>(new StockSubscribe()).eq("code", model.getNewCode()));
-                if (stockSubscribe == null) {
-                    return ServerResponse.createByErrorMsg("Failed. Ipo information does not exist");
-                }
-
-                model.setNewName(stockSubscribe.getName());
-                model.setBuyPrice(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());
-                ret = userStockSubscribeMapper.insert(model);
             }
+            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");
     }
-
     /**
      * 发送站内信
      */
@@ -302,7 +488,7 @@
         if(model!=null){
             //所有人发站内信
             if(model.getUserId() == 0){
-                List<User> users = this.userMapper.listByAdmin(null, null, null, null);
+                List<User> users = this.userMapper.listByAdmin(null, null, null, null,null,null,null,null);
                 for(int k=0;k<users.size();k++){
                     User user = users.get(k);
                     SiteMessage siteMessage = new SiteMessage();
@@ -336,11 +522,10 @@
 
     /*新股申购-查询列表*/
     @Override
-    public ServerResponse<PageInfo> getList(int pageNum, int pageSize, String keyword, HttpServletRequest request){
+    public ServerResponse<PageInfo> getList(int pageNum, int pageSize, String keyword, String agentId,HttpServletRequest request){
         PageHelper.startPage(pageNum, pageSize);
-        List<UserStockSubscribe> listData = this.userStockSubscribeMapper.pageList(pageNum, pageSize, keyword);
-        PageInfo pageInfo = new PageInfo(listData);
-        pageInfo.setList(listData);
+        List<UserStockSubscribe> listData = this.userStockSubscribeMapper.pageList(pageNum, pageSize, keyword,agentId);
+        PageInfo<UserStockSubscribe> pageInfo = new PageInfo<>(listData);
         return ServerResponse.createBySuccess(pageInfo);
     }
 
@@ -352,105 +537,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) {
-            String userJson = RedisShardedPoolUtils.get(header);
-            User user = (User) JsonUtil.string2Obj(userJson, User.class);
-            if (user == null) {
-                return ServerResponse.createByErrorMsg("User not logged in");
-            }
-            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("code", userStockSubscribe1.getNewCode()));
-                if (stockSubscribe != null) {
-                    list.add(userStockSubscribe1);
-                }
-            }
-//            PageInfo pageInfo = new PageInfo();
-//            pageInfo.setList(userStockSubscribe);
-//            GoogleTranslateUtil transan = new GoogleTranslateUtil();
-//            //list转String
-//            String json = JsonUtil.obj2String(list);
-//            String translate;
-//            try {
-//                translate = transan.translate("zh", "en", json);
-//            } catch (Exception e) {
-//                throw new RuntimeException(e);
-//            }
-//            //String转list
-//            List<UserStockSubscribe> list1 = JsonUtil.string2Obj(translate, List.class, UserStockSubscribe.class);
-            return ServerResponse.createBySuccess(list);
+             User user = iUserService.getCurrentRefreshUser(request);
+            List<UserStockSubscribeVo> userStockSubscribe = this.userStockSubscribeMapper.getListByParam(user.getId(), type, status);
+            return ServerResponse.createBySuccess(userStockSubscribe);
         }
-        return ServerResponse.createByErrorMsg("Please log in first");
+        return ServerResponse.createByErrorCodeMsg(ResponseCode.NEED_LOGIN.getCode(),"请先登录");
     }
+
+    @Override
+    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);
+            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.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) {
-            String userJson = RedisShardedPoolUtils.get(header);
-            User user = (User) JsonUtil.string2Obj(userJson, User.class);
-            if (user == null) {
-                return ServerResponse.createByErrorMsg("User not logged in");
-            }
-            if(id == null){
-                return ServerResponse.createByErrorMsg("Parameter error");
-            }
-            UserStockSubscribe userStockSubscribe = userStockSubscribeMapper.load(id);
-            log.info("userStockSubscribe:{}",userStockSubscribe);
-            if (userStockSubscribe != null && userStockSubscribe.getUserId().equals(user.getId())) {
-                StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<>(new StockSubscribe()).eq("code", userStockSubscribe.getNewCode()));
-                if(userStockSubscribe.getType()== 2 ){
-                    return ServerResponse.createByErrorMsg("No payment is required for offline placement");
+        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 (stockSubscribe.getSubscriptionTime().getTime() < System.currentTimeMillis()) {
-                    return ServerResponse.createByErrorMsg("The subscription time has passed");
-                }
-                if (userStockSubscribe.getStatus() == 3) {
-                    userStockSubscribe.setSubmitTime(DateTimeUtil.getCurrentDate());
-                    userStockSubscribe.setStatus(4);
+                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());
 
-                    User user1 = userMapper.selectById(userStockSubscribe.getUserId());
-//                log.info("user" + user1);
-//                    log.info("原可用资金"+user1.getEnableAmt());
-//                    log.info("enableAmt" + enableAmt);
-//                    log.info("可用资金" + user1.getEnableAmt()+"保证金"+userStockSubscribe.getBond()+"原djzj"+user1.getDjzj());
-                    ret = userMapper.updateById(user1);
-                }
-                else {
-                    return ServerResponse.createByErrorMsg("There is no fee for unsuccessful applicants");
-                }
-            } else {
-                return ServerResponse.createByErrorMsg("New share subscription order does not exist!");
-            }
-
-            if (ret > 0) {
-                ret = userStockSubscribeMapper.update1(userStockSubscribe);
-                if (ret > 0) {
-                    return ServerResponse.createBySuccessMsg("Successful operation");
+                        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("Operation failure");
+                    return ServerResponse.createByErrorMsg("新股认购订单不存在!",request);
                 }
-            }else {
-                return ServerResponse.createByErrorMsg("Deduction failure");
             }
+            return ServerResponse.createByErrorCodeMsg(ResponseCode.NEED_LOGIN.getCode(),"请先登录");
+        } catch (Exception e) {
+            return ServerResponse.createByErrorMsg(e.getMessage());
         }
-        return ServerResponse.createByErrorMsg("Please log in first");
     }
     /**
      * 新股申购-删除
@@ -470,9 +633,6 @@
         }
         return ServerResponse.createByErrorMsg("Operation failure");
     }
-
-
-
 
 
 }
\ No newline at end of file

--
Gitblit v1.9.3