From 40a326d5f9797ff12cb9b3da7625b1d7db3cc908 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 09 Oct 2024 11:48:39 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java | 36 ++++++++++++++++++++++--------------
1 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
index b2b068b..f2b72db 100644
--- a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
@@ -2,6 +2,7 @@
import cn.hutool.core.convert.Convert;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
@@ -14,6 +15,7 @@
import com.nq.enums.EUserAssets;
import com.nq.pojo.*;
import com.nq.service.*;
+import com.nq.utils.redis.CookieUtils;
import com.nq.utils.timeutil.DateTimeUtil;
import com.nq.utils.KeyUtils;
import com.nq.utils.PropertiesUtil;
@@ -31,6 +33,8 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -71,7 +75,6 @@
@Autowired
UserAssetsMapper userAssetsMapper;
-
/**
* 用户新股申购
* @param model
@@ -101,10 +104,13 @@
if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
}
- if(new Date().before(stockSubscribe.getSubscribeTime()) && new Date().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()));
@@ -118,15 +124,18 @@
return ServerResponse.createByErrorMsg("新的股票代码不存在",request);
}
- if ( model.getApplyNums() == null){
- // 申请数量为空时返回错误信息
- return ServerResponse.createByErrorMsg("申请数量不能为空", request);
- }
+// if ( model.getApplyNums() == null){
+// // 申请数量为空时返回错误信息
+// return ServerResponse.createByErrorMsg("申请数量不能为空", request);
+// }
+//
+// if (model.getApplyNums() > stockSubscribe.getOrderNumber()){
+// // 申请数量大于订单数量时返回错误信息
+// return ServerResponse.createByErrorMsg("最多可申购：" + stockSubscribe.getOrderNumber(), request);
+// }
- if (model.getApplyNums() > stockSubscribe.getOrderNumber()){
- // 申请数量大于订单数量时返回错误信息
- return ServerResponse.createByErrorMsg("最多可申购：" + stockSubscribe.getOrderNumber(), request);
- }
+ //默认数量最大
+ model.setApplyNums(stockSubscribe.getOrderNumber().intValue());
if(stockSubscribe.getType() == 1){
model.setUserId(user.getId());
@@ -309,8 +318,7 @@
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()));
+ StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new LambdaQueryWrapper<>(StockSubscribe.class).eq(StockSubscribe::getCode,model.getNewCode()));
if (stockSubscribe == null) {
return ServerResponse.createByErrorMsg("Failed. Ipo information does not exist");
}
--
Gitblit v1.9.3