From e0ce7bc8678e771d13090d9b262eb833aef114b9 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Fri, 04 Jul 2025 18:44:31 +0800
Subject: [PATCH] 新增websocket美国、墨西哥客户端 多线程执行同步股票、新闻咨询抓取
---
src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java | 442 ++++++++++++++++++++++++++++++------------------------
1 files changed, 245 insertions(+), 197 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
index 796615c..34261d8 100644
--- a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
@@ -1,21 +1,27 @@
package com.nq.service.impl;
+import cn.hutool.core.convert.Convert;
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.enums.EStockType;
+import com.nq.enums.EUserAssets;
import com.nq.pojo.*;
import com.nq.service.*;
-import com.nq.utils.DateTimeUtil;
+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 lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -42,12 +48,12 @@
@Resource
private UserStockSubscribeMapper userStockSubscribeMapper;
- @Autowired
+ @Resource
UserMapper userMapper;
@Autowired
ISiteMessageService iSiteMessageService;
- @Autowired
+ @Resource
StockSubscribeMapper stockSubscribeMapper;
@Autowired
IUserPositionService iUserPositionService;
@@ -57,110 +63,163 @@
IUserService iUserService;
@Autowired
ISiteSettingService iSiteSettingService;
+ @Autowired
+ TradingHourServiceImpl tradingHourService;
+
+ @Resource
+ IUserAssetsServices iUserAssetsServices;
+
+ @Autowired
+ UserAssetsMapper userAssetsMapper;
+
/**
* 用户新股申购
* @param model
* @return
*/
@Override
- public ServerResponse insert(UserStockSubscribe model, HttpServletRequest request) throws Exception {
+ @Transactional
+ public ServerResponse insert(UserStockSubscribeAddIn model, HttpServletRequest request) throws Exception {
int ret = 0;
if (model == null) {
- return ServerResponse.createByErrorMsg("Parameter error");
+ return ServerResponse.createByErrorMsg("参数错误",request);
}
- String property = PropertiesUtil.getProperty("user.cookie.name");
- String header = request.getHeader(property);
- if (header != null) {
- String userJson = RedisShardedPoolUtils.get(header);
- User user = this.iUserService.getCurrentRefreshUser(request);
- if (user == null){
- return ServerResponse.createBySuccessMsg("請先登錄");
- }
+ User user = iUserService.getCurrentRefreshUser(request);
+ synchronized (user.getId()){
+ UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId("IN",user.getId());
if (model.getNewCode() != null) {
- StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<StockSubscribe>().eq("code", model.getNewCode()));
+ 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);
+ }
//实名认证开关
SiteProduct siteProduct = iSiteProductService.getProductSetting();
- if (siteProduct.getRealNameDisplay() && (StringUtils.isBlank(user.getRealName()) || StringUtils.isBlank(user.getIdCard()))) {
- return ServerResponse.createByErrorMsg("Order failed, please first real name authentication");
+ if (siteProduct.getRealNameDisplay() && user.getIsActive() != 2) {
+ return ServerResponse.createByErrorMsg("订单失败，请先实名认证",request);
}
- //判断休息日不能买入
- if (siteProduct.getHolidayDisplay()) {
- return ServerResponse.createByErrorMsg("No trading on weekends or holidays！");
+ if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
+ return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
}
- //重复申购限制
-// UserStockSubscribe userStockSubscribe = userStockSubscribeMapper.selectOne(new QueryWrapper<UserStockSubscribe>().eq("new_code", model.getNewCode()).eq("user_id", user.getId()));
-// if (userStockSubscribe != null) {
-// return ServerResponse.createByErrorMsg("请勿重复申购");
-// }
+
+ if ( model.getApplyNums() == null){
+ // 申请数量为空时返回错误信息
+ return ServerResponse.createByErrorMsg("申请数量不能为空", request);
+ }
+ if(model.getApplyNums() < stockSubscribe.getMinNumber() ){
+ return ServerResponse.createByErrorMsg("最少申购：" + stockSubscribe.getMinNumber(), request);
+ }
+ if (model.getApplyNums() > stockSubscribe.getOrderNumber()){
+ 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);
+ }
+
+ Date currentDate = new Date();
+ if(currentDate.before(stockSubscribe.getSubscriptionTime())){
+ return ServerResponse.createByErrorMsg("未开售",request);
+ }
+ if(currentDate.after(stockSubscribe.getSubscribeTime())){
+ 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("Order failed, account has been locked");
+ return ServerResponse.createByErrorMsg("订单失败，帐户已被锁定",request);
}
if (stockSubscribe == null) {
- return ServerResponse.createByErrorMsg("The new stock code does not exist");
- }
- //时间判定当前时间是否是申购时间
- SiteSetting siteSetting = this.iSiteSettingService.getSiteSetting();
- if (siteSetting == null) {
- log.error("下单出错，网站设置表不存在");
- return ServerResponse.createByErrorMsg("Order failed, system setting error");
- }
- String am_begin = siteSetting.getTransAmBegin();
- String am_end = siteSetting.getTransAmEnd();
- String pm_begin = siteSetting.getTransPmBegin();
- String pm_end = siteSetting.getTransPmEnd();
- boolean am_flag = BuyAndSellUtils.isTransTime(am_begin, am_end);
- boolean pm_flag = BuyAndSellUtils.isTransTime(pm_begin, pm_end);
- log.info("是否在上午交易时间 = {} 是否在下午交易时间 = {}", Boolean.valueOf(am_flag), Boolean.valueOf(pm_flag));
- if (!am_flag && !pm_flag) {
- return ServerResponse.createByErrorMsg("Application failed, not in the trading session");
- }
- //时间判定当前时间是否是申购时间
- if (stockSubscribe.getSubscribeTime().getTime() < System.currentTimeMillis()) {
- return ServerResponse.createByErrorMsg("The application time has passed");
+ return ServerResponse.createByErrorMsg("新的股票代码不存在",request);
}
- if (model.getApplyNums() == null || model.getApplyNums() > stockSubscribe.getOrderNumber()|| model.getApplyNums() < 500) {
- return ServerResponse.createByErrorMsg("The minimum purchase quantity is 500, the maximum is large" + stockSubscribe.getOrderNumber());
- }
- if (stockSubscribe.getType() == 2) {
+ model.setApplyNums((int) (model.getApplyNums()*stockSubscribe.getLever()));
- if (user.getEnableAmt().compareTo(new BigDecimal(model.getApplyNums()).multiply(stockSubscribe.getPrice())) < 0) {
- return ServerResponse.createByErrorMsg("The user's available balance is insufficient, and the application conditions are not met足");
+ //计算申购金额
+ 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());
+ }
+
+ 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()));
}
- user.setEnableAmt(user.getEnableAmt().subtract(new BigDecimal(model.getApplyNums()).multiply(stockSubscribe.getPrice())));
- if (user.getDjzj()!=null) {
- user.setDjzj(user.getDjzj().add(new BigDecimal(model.getApplyNums()).multiply(stockSubscribe.getPrice())));
- }else
- {
- user.setDjzj(new BigDecimal(model.getApplyNums()).multiply(stockSubscribe.getPrice()));
+ userAssetsMapper.updateById(userAssets);
+
+ if (ret > 0) {
+ return ServerResponse.createBySuccessMsg("申购成功",request);
+ } else {
+ return ServerResponse.createByErrorMsg("申购失败",request);
}
- int u = userMapper.updateById(user);
- if (u <= 0) {
- return ServerResponse.createByErrorMsg("Application failed due to unknown reasons");
+ }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(EStockType.US.getCode(), user.getId(),EUserAssets.BUY,bound.negate(),"","");
+ if (ret > 0) {
+ return ServerResponse.createBySuccessMsg("配售成功",request);
+ } else {
+ 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.getPrice());
-
- model.setBond(new BigDecimal(model.getApplyNums()).multiply(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());
- }
-
- ret = userStockSubscribeMapper.insert(model);
- if (ret > 0) {
- return ServerResponse.createBySuccessMsg("Successful application");
- } else {
- return ServerResponse.createByErrorMsg("Application failure");
}
}
- return ServerResponse.createByErrorMsg("Not logged in");
+ return ServerResponse.createByErrorMsg("申购失败",request);
}
@Override
public int update(UserStockSubscribe model) {
@@ -172,9 +231,9 @@
* admin 新股申购-添加和修改
*/
@Override
- public ServerResponse save(UserStockSubscribe model, HttpServletRequest request) {
+ @Transactional
+ public ServerResponse save(UserStockSubscribe model, HttpServletRequest request) throws Exception {
int ret = 0;
-// log.info("model"+model);
if( model.getId() != null ){
if (model.getStatus() == 3||model.getStatus() == 2) {
model.setEndTime(DateTimeUtil.getCurrentDate());
@@ -183,25 +242,78 @@
if (userStockSubscribe.getStatus() == 5) {
return ServerResponse.createByErrorMsg("It's been converted");
}
-// else if (userStockSubscribe.getStatus() == 3) {
-// return ServerResponse.createByErrorMsg("已经审核过并且中签了，无法再次更改状态");
-// }else if (userStockSubscribe.getStatus() == 2) {
-// return ServerResponse.createByErrorMsg("已经审核过并且未中签");
-// }
- StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<>(new StockSubscribe()).eq("code", userStockSubscribe.getNewCode()));
- if (model.getStatus() == 3 && model.getApplyNumber() != null){
- if(stockSubscribe.getOrderNumber()< model.getApplyNumber()){
- return ServerResponse.createByErrorMsg("The number of successful applications exceeds the maximum number of applications");
- }
- model.setBond(stockSubscribe.getPrice().multiply(BigDecimal.valueOf(model.getApplyNumber())));
- ret = userStockSubscribeMapper.update1(model);
- }else if (model.getStatus() == 2){
- ret = userStockSubscribeMapper.update1(model);
- }else if (model.getStatus() == 5){
- return iUserPositionService.newStockToPosition(model.getId());
-
+ if(userStockSubscribe.getStatus() == 3){
+ return ServerResponse.createByErrorMsg("不能更改申购状态");
+ }
+ StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<>(new StockSubscribe())
+ .eq("newlist_id", userStockSubscribe.getNewStockId()));
+ 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);
}
+ //客户中签直接扣除客户账户可用资金
+ UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId("IN", userStockSubscribe.getUserId());
+ if (model.getStatus() == 3 && model.getApplyNumber() != null){
+ if(stockSubscribe.getType() == 1){
+ model.setBond((stockSubscribe.getMinPrice() != null ? stockSubscribe.getMinPrice() : stockSubscribe.getPrice()).multiply(BigDecimal.valueOf(model.getApplyNumber())));
+ model.setDbMoney(model.getDbMoney());
+
+ if(null == userAssets){
+ return ServerResponse.createByErrorMsg("客户资金账户不存在");
+ }
+ 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 refundPrice = userStockSubscribe.getBuyPrice().multiply(new BigDecimal(applyNumber));
+ BigDecimal subtract = refundPrice.subtract(userAssets.getAmountToBeCovered());
+ if(subtract.compareTo(BigDecimal.ZERO) <= 0){//如果退回的资金不足补足待补则直接减
+ userAssets.setAmountToBeCovered(userAssets.getAmountToBeCovered().subtract(refundPrice));
+ }else{//如果退回的资金足够填补待补资金还有剩余，则返回余额
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(refundPrice).add(userAssets.getAmountToBeCovered()));
+ userAssets.setAmountToBeCovered(BigDecimal.ZERO);
+ userAssets.setAvailableBalance(subtract);
+ }
+ }
+ }
+ ret = userStockSubscribeMapper.update1(model);
+ userAssetsMapper.updateById(userAssets);
+ iUserPositionService.newStockToPosition(model.getId(),userAssets.getAmountToBeCovered());//转持仓
+ model.setStatus(5);
+ }else{
+ if(model.getApplyNumber()>model.getApplyNums()){
+ return ServerResponse.createByErrorMsg("配置中签数量不能超过申请数量",request);
+ }
+ 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(),
+ EUserAssets.TOP_UP,tMoney,"","");
+ model.setBond((stockSubscribe.getMinPrice() != null ? stockSubscribe.getMinPrice() : stockSubscribe.getPrice()).multiply(BigDecimal.valueOf(model.getApplyNumber())));
+ model.setDbMoney(BigDecimal.ZERO);
+ model.setStatus(4);
+ ret = userStockSubscribeMapper.update1(model);
+ }
+ }else if (model.getStatus() == 2){
+ BigDecimal bond = (stockSubscribe.getMinPrice() != null ? stockSubscribe.getMinPrice() : stockSubscribe.getPrice()).multiply(BigDecimal.valueOf(model.getApplyNums()));
+ BigDecimal subtractMoney = bond.subtract(userAssets.getAmountToBeCovered());//需要退回的钱
+ userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(subtractMoney.abs()));
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(subtractMoney));
+ userAssets.setAmountToBeCovered(BigDecimal.ZERO);
+ userAssetsMapper.updateById(userAssets);
+ ret = userStockSubscribeMapper.update1(model);
+ }else if (model.getStatus() == 5){
+ return iUserPositionService.newStockToPosition(model.getId(),BigDecimal.ZERO);
+
+ }
if(ret>0 && model.getStatus() == 3 ){
//给用户推送消息
SiteMessage siteMessage = new SiteMessage();
@@ -214,21 +326,8 @@
if (stockSubscribe.getType() == 2){
- User user = userMapper.selectByPrimaryKey(userStockSubscribe.getUserId());
- UserStockSubscribe userStockSubscribe1 = userStockSubscribeMapper.load(model.getId());
- int refundenum = userStockSubscribe1.getApplyNums() - model.getApplyNumber();
-// log.info("refundenum"+refundenum);
- Integer refund =refundenum * stockSubscribe.getPrice().intValue();
-// log.info("退还金额"+refund);
- user.setEnableAmt(user.getEnableAmt().add(BigDecimal.valueOf(refund)));
- user.setDjzj(user.getDjzj().subtract(BigDecimal.valueOf(refund)));
- int ret1 = userMapper.updateByPrimaryKey(user);
- if (ret1 <= 0) {
- return ServerResponse.createByErrorMsg("Application failed due to unknown reasons");
- }
- siteMessage.setContent("【新股申购中签】恭喜您，新股申购中签成功，申购金额："+ userStockSubscribe.getBond() +"退还"+refund+"，请及时关注哦。");
+ siteMessage.setContent("【新股申购中签】恭喜您，新股申购中签成功，申购金额："+ userStockSubscribe.getBond() +"请及时关注哦。");
}else {
-
siteMessage.setContent("【新股申购中签】恭喜您，新股申购中签成功，申购金额：" + userStockSubscribe.getBond() + "，请及时关注哦。");
}
iSiteMessageService.insert(siteMessage);
@@ -245,9 +344,7 @@
siteMessage.setAddTime(DateTimeUtil.getCurrentDate());
iSiteMessageService.insert(siteMessage);
}else {
- User user = userMapper.selectByPrimaryKey(userStockSubscribe.getUserId());
- user.setEnableAmt(user.getEnableAmt().add(userStockSubscribe.getBond()));
- user.setDjzj(user.getDjzj().subtract(userStockSubscribe.getBond()));
+ User user = userMapper.selectById(userStockSubscribe.getUserId());
userMapper.updateByPrimaryKey(user);
SiteMessage siteMessage = new SiteMessage();
siteMessage.setUserId(userStockSubscribe.getUserId());
@@ -260,8 +357,6 @@
}
}
-
-
} else{
if(model.getPhone() != null&&model.getId()==null) {
User user = userMapper.findByPhone(model.getPhone());
@@ -272,19 +367,14 @@
model.setUserId(user.getId());
model.setAgentId(user.getAgentId());
model.setAgentName(user.getAgentName());
-
-
-// String cookie_name = PropertiesUtil.getProperty("admin.cookie.name");
-// String logintoken = CookieUtils.readLoginToken(request, cookie_name);
-// String adminJson = RedisShardedPoolUtils.get(logintoken);
-// SiteAdmin siteAdmin = (SiteAdmin) JsonUtil.string2Obj(adminJson, SiteAdmin.class);
- StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<>(new StockSubscribe()).eq("code", model.getNewCode()));
+ StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<>(new StockSubscribe())
+ .eq("newlist_id", model.getNewStockId()));
if (stockSubscribe == null) {
return ServerResponse.createByErrorMsg("Failed. Ipo information does not exist");
}
model.setNewName(stockSubscribe.getName());
- model.setBuyPrice(stockSubscribe.getPrice());
+ model.setBuyPrice(stockSubscribe.getMinPrice() != null ? stockSubscribe.getMinPrice() : stockSubscribe.getPrice());
if (model.getApplyNums() > stockSubscribe.getOrderNumber() || model.getApplyNumber() > stockSubscribe.getOrderNumber()) {
return ServerResponse.createByErrorMsg("The number of applications or the number of wins is the maximum" + stockSubscribe.getOrderNumber());
}
@@ -292,7 +382,8 @@
model.setAddTime(DateTimeUtil.getCurrentDate());
model.setOrderNo(KeyUtils.getUniqueKey());
model.setType(stockSubscribe.getType());
- ret = userStockSubscribeMapper.insert(model);
+ UserStockSubscribeAddIn convert = Convert.convert(UserStockSubscribeAddIn.class, model);
+ return insert(convert,request);
}
}
if(ret>0){
@@ -301,7 +392,6 @@
return ServerResponse.createByErrorMsg("Operation failure");
}
-
/**
* 发送站内信
*/
@@ -312,7 +402,7 @@
if(model!=null){
//所有人发站内信
if(model.getUserId() == 0){
- List<User> users = this.userMapper.listByAdmin(null, null, null, null);
+ List<User> users = this.userMapper.listByAdmin(null, null, null, null,null,null,null,null);
for(int k=0;k<users.size();k++){
User user = users.get(k);
SiteMessage siteMessage = new SiteMessage();
@@ -326,7 +416,7 @@
}
} else {
//指定用户发站内信
- User user = userMapper.selectByPrimaryKey(model.getUserId());
+ User user = userMapper.selectById(model.getUserId());
SiteMessage siteMessage = new SiteMessage();
siteMessage.setUserId(user.getId());
siteMessage.setUserName(user.getRealName());
@@ -346,9 +436,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);
@@ -366,11 +456,7 @@
String property = PropertiesUtil.getProperty("user.cookie.name");
String header = request.getHeader(property);
if (header != null) {
- String userJson = RedisShardedPoolUtils.get(header);
- User user = (User) JsonUtil.string2Obj(userJson, User.class);
- if (user == null) {
- return ServerResponse.createByErrorMsg("User not logged in");
- }
+ User user = iUserService.getCurrentRefreshUser(request);
List<UserStockSubscribe> userStockSubscribe = null;
if (type==null||type.equals("")){
userStockSubscribe = this.userStockSubscribeMapper.selectList(new QueryWrapper<>(new UserStockSubscribe()).eq("user_id", user.getId()).orderByDesc("add_time"));
@@ -380,27 +466,15 @@
List<UserStockSubscribe> list = new ArrayList<>();
for (UserStockSubscribe userStockSubscribe1 : userStockSubscribe) {
- StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<>(new StockSubscribe()).eq("code", userStockSubscribe1.getNewCode()));
+ StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<>(new StockSubscribe())
+ .eq("newlist_id", userStockSubscribe1.getNewStockId()));
if (stockSubscribe != null) {
list.add(userStockSubscribe1);
}
}
-// PageInfo pageInfo = new PageInfo();
-// pageInfo.setList(userStockSubscribe);
-// GoogleTranslateUtil transan = new GoogleTranslateUtil();
-// //list转String
-// String json = JsonUtil.obj2String(list);
-// String translate;
-// try {
-// translate = transan.translate("zh", "en", json);
-// } catch (Exception e) {
-// throw new RuntimeException(e);
-// }
-// //String转list
-// List<UserStockSubscribe> list1 = JsonUtil.string2Obj(translate, List.class, UserStockSubscribe.class);
return ServerResponse.createBySuccess(list);
}
- return ServerResponse.createByErrorMsg("Please log in first");
+ return ServerResponse.createByErrorMsg("请先登录",request);
}
/**
* 新股申购-用户提交金额
@@ -412,65 +486,39 @@
String property = PropertiesUtil.getProperty("user.cookie.name");
String header = request.getHeader(property);
if (header != null) {
- String userJson = RedisShardedPoolUtils.get(header);
- User user = (User) JsonUtil.string2Obj(userJson, User.class);
- if (user == null) {
- return ServerResponse.createByErrorMsg("User not logged in");
- }
+ User user = iUserService.getCurrentRefreshUser(request);
if(id == null){
- return ServerResponse.createByErrorMsg("Parameter error");
+ return ServerResponse.createByErrorMsg("参数错误",request);
}
UserStockSubscribe userStockSubscribe = userStockSubscribeMapper.load(id);
- log.info("userStockSubscribe:{}",userStockSubscribe);
if (userStockSubscribe != null && userStockSubscribe.getUserId().equals(user.getId())) {
- StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<>(new StockSubscribe()).eq("code", userStockSubscribe.getNewCode()));
if(userStockSubscribe.getType()== 2 ){
- return ServerResponse.createByErrorMsg("No payment is required for offline placement");
- }
- //判断时间
- if (stockSubscribe.getSubscriptionTime().getTime() < System.currentTimeMillis()) {
- return ServerResponse.createByErrorMsg("The subscription time has passed");
+ return ServerResponse.createByErrorMsg("未中签,无需支付",request);
}
if (userStockSubscribe.getStatus() == 3) {
userStockSubscribe.setSubmitTime(DateTimeUtil.getCurrentDate());
userStockSubscribe.setStatus(4);
+ BigDecimal bigDecimal = iUserAssetsServices.
+ getAvailableBalance(EStockType.US.getCode(),
+ userStockSubscribe.getUserId());
- User user1 = userMapper.selectByPrimaryKey(userStockSubscribe.getUserId());
-// log.info("user" + user1);
- if (user1.getEnableAmt().compareTo(userStockSubscribe.getBond()) < 0) {
- return ServerResponse.createByErrorMsg("Insufficient balance");
+ BigDecimal multiply = userStockSubscribe.getBuyPrice().multiply(new BigDecimal(userStockSubscribe.getApplyNumber()));
+ if(bigDecimal.compareTo(multiply) <= 0){
+ return ServerResponse.createByErrorMsg("余额不足",request);
}
-// log.info("原可用资金"+user1.getEnableAmt());
- BigDecimal enableAmt = user1.getEnableAmt().subtract(userStockSubscribe.getBond());
-// log.info("enableAmt" + enableAmt);
- user1.setEnableAmt(enableAmt);
-// log.info("可用资金" + user1.getEnableAmt()+"保证金"+userStockSubscribe.getBond()+"原djzj"+user1.getDjzj());
- if (user1.getDjzj() != null) {
- user1.setDjzj(user1.getDjzj().add(userStockSubscribe.getBond()));
- }else {
- user1.setDjzj(userStockSubscribe.getBond());
- }
- ret = userMapper.updateByPrimaryKeySelective(user1);
- }
- else {
- return ServerResponse.createByErrorMsg("There is no fee for unsuccessful applicants");
+ iUserAssetsServices.availablebalanceChange(EStockType.US.getCode(),userStockSubscribe.getUserId(),
+ EUserAssets.BUY,multiply.negate(),"","");
+ userStockSubscribe.setDbMoney(BigDecimal.ZERO);
+ userStockSubscribeMapper.update1(userStockSubscribe);
+ return ServerResponse.createBySuccess();
+ } else {
+ return ServerResponse.createByErrorMsg("不成功的申请者不收取任何费用",request);
}
} else {
- return ServerResponse.createByErrorMsg("New share subscription order does not exist！");
- }
-
- if (ret > 0) {
- ret = userStockSubscribeMapper.update1(userStockSubscribe);
- if (ret > 0) {
- return ServerResponse.createBySuccessMsg("Successful operation");
- } else {
- return ServerResponse.createByErrorMsg("Operation failure");
- }
- }else {
- return ServerResponse.createByErrorMsg("Deduction failure");
+ return ServerResponse.createByErrorMsg("新股认购订单不存在!",request);
}
}
- return ServerResponse.createByErrorMsg("Please log in first");
+ return ServerResponse.createByErrorMsg("请先登录",request);
}
/**
* 新股申购-删除
--
Gitblit v1.9.3