From 37c4b8d314a93ac866a7886b262346ff8810dc3e Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Wed, 16 Jul 2025 17:57:10 +0800
Subject: [PATCH] bug修改
---
src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
index 535c81f..2535854 100644
--- a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
+import com.nq.common.ResponseCode;
import com.nq.common.ServerResponse;
import com.nq.dao.StockSubscribeMapper;
import com.nq.dao.UserAssetsMapper;
@@ -17,11 +18,8 @@
import com.nq.utils.timeutil.DateTimeUtil;
import com.nq.utils.KeyUtils;
import com.nq.utils.PropertiesUtil;
-import com.nq.utils.redis.JsonUtil;
-import com.nq.utils.redis.RedisShardedPoolUtils;
-import com.nq.utils.stock.BuyAndSellUtils;
import com.nq.vo.stock.UserStockSubscribeAddIn;
-import com.sun.org.apache.bcel.internal.generic.RETURN;
+import com.nq.vo.subscribe.UserStockSubscribeVo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -211,7 +209,7 @@
UserStockSubscribe userStockSubscribe = Convert.convert(UserStockSubscribe.class, model);
userStockSubscribe.setNewStockId(stockSubscribe.getNewlistId());
ret = userStockSubscribeMapper.insert(userStockSubscribe);
- iUserAssetsServices.availablebalanceChange(EStockType.US.getCode(), user.getId(),EUserAssets.BUY,bound.negate(),"","");
+ iUserAssetsServices.availablebalanceChange(stockSubscribe.getStockType(), user.getId(),EUserAssets.BUY,bound.negate(),"","");
if (ret > 0) {
return ServerResponse.createBySuccessMsg("配售成功",request);
} else {
@@ -296,7 +294,7 @@
}
BigDecimal cCount = new BigDecimal(model.getApplyNums()-model.getApplyNumber());
BigDecimal tMoney = ((stockSubscribe.getMinPrice() != null ? stockSubscribe.getMinPrice() : stockSubscribe.getPrice())).multiply(cCount);
- iUserAssetsServices.availablebalanceChange(EStockType.US.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);
@@ -440,8 +438,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);
}
@@ -453,20 +450,21 @@
/*新股申购-查询用户最新新股申购数据*/
@Override
- public ServerResponse getOneSubscribeByUserId(String type,HttpServletRequest request) {
+ public ServerResponse getOneSubscribeByUserId(String type, Integer status, HttpServletRequest request) {
String property = PropertiesUtil.getProperty("user.cookie.name");
String header = request.getHeader(property);
if (header != null) {
User user = iUserService.getCurrentRefreshUser(request);
- List<UserStockSubscribe> userStockSubscribe = null;
- if (type==null||type.equals("")){
+
+ List<UserStockSubscribeVo> userStockSubscribe = this.userStockSubscribeMapper.getListByParam(user.getId(), type, status);
+ /*if (type==null||type.equals("")){
userStockSubscribe = this.userStockSubscribeMapper.selectList(new QueryWrapper<>(new UserStockSubscribe()).eq("user_id", user.getId()).orderByDesc("add_time"));
}else{
userStockSubscribe = this.userStockSubscribeMapper.selectList(new QueryWrapper<>(new UserStockSubscribe()).eq("user_id", user.getId()).eq("type", type).orderByDesc("add_time"));
- }
+ }*/
- List<UserStockSubscribe> list = new ArrayList<>();
- for (UserStockSubscribe userStockSubscribe1 : userStockSubscribe) {
+ List<UserStockSubscribeVo> list = new ArrayList<>();
+ for (UserStockSubscribeVo userStockSubscribe1 : userStockSubscribe) {
StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<>(new StockSubscribe())
.eq("newlist_id", userStockSubscribe1.getNewStockId()));
if (stockSubscribe != null) {
@@ -475,7 +473,7 @@
}
return ServerResponse.createBySuccess(list);
}
- return ServerResponse.createByErrorCodeMsg(401,"请先登录");
+ return ServerResponse.createByErrorCodeMsg(ResponseCode.NEED_LOGIN.getCode(),"请先登录");
}
/**
* 新股申购-用户提交金额
@@ -497,6 +495,11 @@
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.
@@ -507,7 +510,7 @@
if(bigDecimal.compareTo(multiply) <= 0){
return ServerResponse.createByErrorMsg("余额不足",request);
}
- iUserAssetsServices.availablebalanceChange(EStockType.US.getCode(),userStockSubscribe.getUserId(),
+ iUserAssetsServices.availablebalanceChange(stockSubscribe.getStockType(), userStockSubscribe.getUserId(),
EUserAssets.BUY,multiply.negate(),"","");
userStockSubscribe.setDbMoney(BigDecimal.ZERO);
userStockSubscribeMapper.update1(userStockSubscribe);
@@ -519,7 +522,7 @@
return ServerResponse.createByErrorMsg("新股认购订单不存在!",request);
}
}
- return ServerResponse.createByErrorCodeMsg(401,"请先登录");
+ return ServerResponse.createByErrorCodeMsg(ResponseCode.NEED_LOGIN.getCode(),"请先登录");
}
/**
* 新股申购-删除
@@ -539,9 +542,6 @@
}
return ServerResponse.createByErrorMsg("Operation failure");
}
-
-
-
}
\ No newline at end of file
--
Gitblit v1.9.3