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 | 329 ++++++++++++++++++++++++++++++------------------------
1 files changed, 182 insertions(+), 147 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
index 3faf5d6..15df013 100644
--- a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
@@ -5,12 +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.*;
@@ -23,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.*;
/**
* 新股申购
@@ -59,16 +55,18 @@
ISiteProductService iSiteProductService;
@Autowired
IUserService iUserService;
- @Autowired
- ISiteSettingService iSiteSettingService;
- @Autowired
- TradingHourServiceImpl tradingHourService;
@Resource
IUserAssetsServices iUserAssetsServices;
@Autowired
UserAssetsMapper userAssetsMapper;
+
+ @Autowired
+ MoneyLogMapper moneyLogMapper;
+
+ @Autowired
+ RedisLockService redisLockService;
/**
* 用户新股申购
@@ -83,11 +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(StringUtils.isNotEmpty(stockSubscribe.getPassword()) && !stockSubscribe.getPassword().equals(model.getPassword())){
return ServerResponse.createByErrorMsg("密钥输入错误",request);
@@ -97,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);
}
@@ -113,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())){
@@ -126,12 +133,12 @@
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);
}
@@ -148,75 +155,74 @@
}else{
bound = new BigDecimal(model.getApplyNums()).multiply(stockSubscribe.getPrice());
}
+ 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(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);
- if (ret > 0) {
- return ServerResponse.createBySuccessMsg("申购成功",request);
- } else {
- 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);
+ }
}
- }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);
- }
- 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);
}
@@ -249,9 +255,9 @@
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(stockSubscribe.getStockType(), userStockSubscribe.getUserId());
@@ -266,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().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){//如果退回的资金不足补足待补则直接减
@@ -282,12 +303,26 @@
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);
userAssetsMapper.updateById(userAssets);
- iUserPositionService.newStockToPosition(model.getId(),userAssets.getAmountToBeCovered());//转持仓
- model.setStatus(5);
+// iUserPositionService.newStockToPosition(model.getId(),userAssets.getAmountToBeCovered());//转持仓
+// model.setStatus(5);
}else{
if(model.getApplyNumber()>model.getApplyNums()){
return ServerResponse.createByErrorMsg("配置中签数量不能超过申请数量",request);
@@ -310,52 +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());
@@ -455,26 +490,26 @@
String header = request.getHeader(property);
if (header != null) {
User user = iUserService.getCurrentRefreshUser(request);
-
List<UserStockSubscribeVo> userStockSubscribe = this.userStockSubscribeMapper.getListByParam(user.getId(), type, status);
- /*if (type==null||type.equals("")){
- userStockSubscribe = this.userStockSubscribeMapper.selectList(new QueryWrapper<>(new UserStockSubscribe()).eq("user_id", user.getId()).orderByDesc("add_time"));
- }else{
- userStockSubscribe = this.userStockSubscribeMapper.selectList(new QueryWrapper<>(new UserStockSubscribe()).eq("user_id", user.getId()).eq("type", type).orderByDesc("add_time"));
- }*/
-
- List<UserStockSubscribeVo> list = new ArrayList<>();
- for (UserStockSubscribeVo 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);
+ return ServerResponse.createBySuccess(userStockSubscribe);
}
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(),"请先登录");
+ }
+
/**
* 新股申购-用户提交金额
*/
--
Gitblit v1.9.3