From eb90e532330ced037ffc6ff76b4504c79ac59053 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 25 Sep 2024 10:57:55 +0800
Subject: [PATCH] 废弃
---
src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java | 35 +++++++++++++++++++++--------------
1 files changed, 21 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 538a1b0..9d8ae2e 100644
--- a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
@@ -31,6 +31,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 +73,6 @@
@Autowired
UserAssetsMapper userAssetsMapper;
-
/**
* 用户新股申购
* @param model
@@ -101,10 +102,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 +122,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());
@@ -377,9 +384,9 @@
/*新股申购-查询列表*/
@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);
+ List<UserStockSubscribe> listData = this.userStockSubscribeMapper.pageList(pageNum, pageSize, keyword,agentId);
PageInfo pageInfo = new PageInfo(listData);
pageInfo.setList(listData);
return ServerResponse.createBySuccess(pageInfo);
--
Gitblit v1.9.3