From f37052eabfc9243e2004e7f2d0495f3b838225ad Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 11 Oct 2024 18:33:06 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java | 58 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 39 insertions(+), 19 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..00e66b4 100644
--- a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
@@ -2,18 +2,17 @@
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;
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.*;
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 +30,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;
@@ -72,6 +73,8 @@
@Autowired
UserAssetsMapper userAssetsMapper;
+ @Resource
+ MoneyLogMapper moneyLogMapper;
/**
* 用户新股申购
* @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());
@@ -224,6 +233,7 @@
if(null == userAssets){
return ServerResponse.createByErrorMsg("客户资金账户不存在");
}
+ String after = userAssets.getAvailableBalance().toString();
BigDecimal decimal = userStockSubscribe.getBuyPrice().multiply(new BigDecimal(model.getApplyNumber()));//中签总价
BigDecimal availableBalance = userAssets.getAvailableBalance().subtract(decimal);//剩余可用余额
if(decimal.compareTo(userAssets.getAvailableBalance()) <= 0){
@@ -233,6 +243,17 @@
userAssets.setAvailableBalance(BigDecimal.ZERO);
userAssets.setAmountToBeCovered(userAssets.getAmountToBeCovered().add(amountToBeCovered));
}
+ MoneyLog moneyLog = new MoneyLog();
+ moneyLog.setDescs("中签扣除");
+ moneyLog.setBeFore(userAssets.getAvailableBalance().toString());
+ moneyLog.setAfter(after);
+ moneyLog.setAmount(decimal.toString());
+ moneyLog.setAccectType("IN");
+ moneyLog.setType("中签扣除");
+ moneyLog.setUserId(userAssets.getUserId().toString());
+ moneyLog.setSymbol(EStockType.getEStockTypeByCode("IN").getSymbol());
+ moneyLog.setCreateTime(new Date());
+ moneyLogMapper.insert(moneyLog);
userAssetsMapper.updateById(userAssets);
ret = userStockSubscribeMapper.update1(model);
}else{
@@ -309,8 +330,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");
}
@@ -377,9 +397,9 @@
/*新股申购-查询列表*/
@Override
- public ServerResponse<PageInfo> getList(int pageNum, int pageSize, String keyword, String agentId,HttpServletRequest request){
+ public ServerResponse<PageInfo> getList(int pageNum, int pageSize, String keyword, String agentId,String name,Integer status,HttpServletRequest request){
PageHelper.startPage(pageNum, pageSize);
- List<UserStockSubscribe> listData = this.userStockSubscribeMapper.pageList(pageNum, pageSize, keyword,agentId);
+ List<UserStockSubscribe> listData = this.userStockSubscribeMapper.pageList(pageNum, pageSize, keyword,agentId,name,status);
PageInfo pageInfo = new PageInfo(listData);
pageInfo.setList(listData);
return ServerResponse.createBySuccess(pageInfo);
--
Gitblit v1.9.3