From c114364ebfef1cbfa5234dd76c7d70cda5662f68 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Tue, 15 Jul 2025 16:17:18 +0800
Subject: [PATCH] 新股修改
---
src/main/java/com/nq/service/impl/UserPositionServiceImpl.java | 124 ++++++++++++++++++++++++++++-------------
1 files changed, 85 insertions(+), 39 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
index 2ff418f..13455a5 100644
--- a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
@@ -29,6 +29,7 @@
import com.nq.vo.position.PositionVO;
import com.nq.vo.position.UserPositionVO;
import com.nq.vo.stock.StockListVO;
+import com.nq.vo.stock.ai.StockAiOrderTypeVO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
@@ -43,6 +44,7 @@
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
+import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -153,7 +155,7 @@
return ServerResponse.createByErrorMsg("订单失败，股票代码不存在", request);
}
//判断股票是否在可交易时间段
- Boolean b = tradingHourService.timeCheck(stock.getStockCode());
+ Boolean b = tradingHourService.timeCheck(stock.getStockCode(), stock.getStockType());
if (!b) {
return ServerResponse.createByErrorMsg("订单失败,不在交易时间之内", request);
}
@@ -234,8 +236,8 @@
userPosition.setOrderStayDays(Integer.valueOf(0));
userPosition.setOrderStayFee(BigDecimal.ZERO);
userPositionMapper.insert(userPosition);
- iUserAssetsServices.availablebalanceChange(stock.getStockType(), user.getId(), EUserAssets.BUY, buyAmt.negate(), "", "");
- iUserAssetsServices.availablebalanceChange(stock.getStockType(), user.getId(), EUserAssets.HANDLING_CHARGE, orderFree, "", "");
+ iUserAssetsServices.availablebalanceChange(EStockType.MX.getCode(), user.getId(), EUserAssets.BUY, buyAmt.negate(), "", "");
+ iUserAssetsServices.availablebalanceChange(EStockType.MX.getCode(), user.getId(), EUserAssets.HANDLING_CHARGE, orderFree, "", "");
return ServerResponse.createBySuccessMsg("下单成功", request);
}
}
@@ -286,20 +288,24 @@
@Transactional
public ServerResponse sell(String positionSn, int doType) {
UserPosition userPosition = this.userPositionMapper.findPositionBySn(positionSn);
- BigDecimal siitteBuyFee = iSiteSettingService.getSiteSetting().getBuyFee();
- Boolean b = tradingHourService.timeCheck(userPosition.getStockCode());
- if (!b) {
- return ServerResponse.createByErrorMsg("订单失败,不在交易时间之内");
- }
if (userPosition == null) {
return ServerResponse.createByErrorMsg("平仓失败，订单不存在");
}
- User user = this.userMapper.selectById(userPosition.getUserId());
- if (user.getIsLock() == 1) {
- return ServerResponse.createByErrorMsg("账户已被限制交易");
+ BigDecimal siitteBuyFee = iSiteSettingService.getSiteSetting().getBuyFee();
+ Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("stock_code", userPosition.getStockCode()));
+ if(null == stock){
+ return ServerResponse.createByErrorMsg("股票不存在，平仓失败");
}
+ Boolean b = tradingHourService.timeCheck(userPosition.getStockCode(), stock.getStockType());
+ if (!b) {
+ return ServerResponse.createByErrorMsg("订单失败,不在交易时间之内");
+ }
+ User user = this.userMapper.selectById(userPosition.getUserId());
if (user == null) {
return ServerResponse.createByErrorMsg("平仓失败,用户不存在");
+ }
+ if (user.getIsLock() == 1) {
+ return ServerResponse.createByErrorMsg("账户已被限制交易");
}
if (userPosition.getSellOrderId() != null) {
return ServerResponse.createByErrorMsg("平仓失败, 订单已平仓");
@@ -307,7 +313,7 @@
if (1 == userPosition.getIsLock().intValue()) {
return ServerResponse.createByErrorMsg("this order is closed " + userPosition.getLockMsg());
}
- Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("stock_code", userPosition.getStockCode()));
+ //Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("stock_code", userPosition.getStockCode()));
BigDecimal nowPrice = priceServices.getNowPrice(userPosition.getStockCode());
if (nowPrice.compareTo(new BigDecimal("0")) != 1) {
return ServerResponse.createByErrorMsg("报价0，平仓失败，请稍后再试");
@@ -336,15 +342,22 @@
@Transactional
public ServerResponse sell(String positionSn, int doType, Integer number,HttpServletRequest request) {
UserPosition userPosition = this.userPositionMapper.findPositionBySn(positionSn);
+ if (userPosition == null) {
+ return ServerResponse.createByErrorMsg("平仓失败，订单不存在", request);
+ }
if(null == number || number <= 0 || number > userPosition.getOrderNum()){
return ServerResponse.createByErrorMsg("请输入正确的平仓数", request);
}
// 手续费率
BigDecimal siitteBuyFee = new BigDecimal(iStockConfigServices.queryByKey(EConfigKey.SELL_HANDLING_CHARGE.getCode()).getCValue());
+ Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("stock_code", userPosition.getStockCode()));
+ if(null == stock){
+ return ServerResponse.createByErrorMsg("股票不存在，平仓失败", request);
+ }
UserAssets userAssets = userAssetsMapper.selectOne(new LambdaQueryWrapper<UserAssets>()
.eq(UserAssets::getUserId, userPosition.getUserId())
- .eq(UserAssets::getAccectType, "IN")
+ .eq(UserAssets::getAccectType, stock.getStockType())
);
if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
@@ -354,11 +367,8 @@
if (null != stockSubscribe && DateUtil.date().before(stockSubscribe.getListDate())) {
return ServerResponse.createByErrorMsg("股票未上市，不能平仓", request);
}
- Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("stock_code", userPosition.getStockCode()));
- if(null == stock){
- return ServerResponse.createByErrorMsg("股票不存在，平仓失败", request);
- }
- Boolean b = tradingHourService.timeCheck(userPosition.getStockCode());
+
+ Boolean b = tradingHourService.timeCheck(userPosition.getStockCode(), stock.getStockType());
if (!b) {
return ServerResponse.createByErrorMsg("订单失败,不在交易时间之内", request);
}
@@ -371,15 +381,13 @@
return ServerResponse.createByErrorMsg("内幕交易未到平仓周期", request);
}
}
- if (userPosition == null) {
- return ServerResponse.createByErrorMsg("平仓失败，订单不存在", request);
- }
+
User user = this.userMapper.selectById(userPosition.getUserId());
- if (user.getIsLock() == 1) {
- return ServerResponse.createByErrorMsg("账户已被限制交易", request);
- }
if (user == null) {
return ServerResponse.createByErrorMsg("平仓失败,用户不存在", request);
+ }
+ if (user.getIsLock() == 1) {
+ return ServerResponse.createByErrorMsg("账户已被限制交易", request);
}
if (userPosition.getSellOrderId() != null) {
return ServerResponse.createByErrorMsg("平仓失败, 订单已平仓", request);
@@ -1304,20 +1312,22 @@
return ServerResponse.createByErrorMsg("无该申购记录");
}
StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<StockSubscribe>().eq("newlist_id", userStockSubscribe.getNewStockId()));
- if (userStockSubscribe == null) {
+ if (stockSubscribe == null) {
return ServerResponse.createByErrorMsg("该新股不存在");
}
Stock stock = stockMapper.selectOne(new LambdaQueryWrapper<Stock>().eq(Stock::getStockCode, userStockSubscribe.getNewCode()));
-
+ String stockType;
UserPosition userPosition = new UserPosition();
if(null == stock){
userPosition.setStockCode(stockSubscribe.getCode());
userPosition.setStockSpell(stockSubscribe.getName());
+ stockType = stockSubscribe.getStockType();
}else{
userPosition.setStockCode(stock.getStockCode());
userPosition.setStockSpell(stock.getStockSpell());
+ stockType = stock.getStockType();
}
userPosition.setPositionType(1);
@@ -1330,7 +1340,7 @@
// StringBuffer gid = new StringBuffer();
// gid.append(stockSubscribe.getStockType()!=null?stockSubscribe.getStockType():"");
// gid.append(userStockSubscribe.getNewCode()!=null?userStockSubscribe.getNewCode():"stock code invaild");
- userPosition.setStockGid("IN");
+ userPosition.setStockGid(stockType);
userPosition.setBuyOrderId(GeneratePosition.getPositionId());
userPosition.setBuyOrderTime(new Date());
userPosition.setBuyOrderPrice(userStockSubscribe.getBuyPrice());
@@ -1384,12 +1394,12 @@
userPosition.setNewId(stockSubscribe.getNewlistId());
int ret = 0;
ret = this.userPositionMapper.insert(userPosition);
- UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId("IN", userPosition.getUserId());
+ UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId(stockType, userPosition.getUserId());
if(null == userAssets){
return ServerResponse.createByErrorMsg("新股转持仓失败");
}
userAssetsMapper.updateById(userAssets);
- iUserAssetsServices.availablebalanceChange("IN", userAssets.getUserId(), EUserAssets.HANDLING_CHARGE, buy_fee_amt, "", "");
+ iUserAssetsServices.availablebalanceChange(stockType, userAssets.getUserId(), EUserAssets.HANDLING_CHARGE, buy_fee_amt, "", "");
if (ret > 0) {
userStockSubscribe.setStatus(5);
userStockSubscribeMapper.update1(userStockSubscribe);
@@ -1665,7 +1675,7 @@
/**
* 大宗下单
*
- * @param stockCode
+ * @param dzId
* @param password
* @param num
* @param request
@@ -1683,10 +1693,6 @@
if (siteProduct.getRealNameDisplay() && user.getIsLock().intValue() == 1) {
return ServerResponse.createByErrorMsg("Order failed, account has been locked");
}
- UserAssets userAssets = userAssetsServices.assetsByTypeAndUserId("IN", user.getId());
- if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
- return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
- }
StockDz stockDz = this.stockDzMapper.selectOne(new QueryWrapper<StockDz>().eq("id", dzId));
if (StringUtils.isNotEmpty(stockDz.getPassword()) && !Objects.equals(stockDz.getPassword(), password)) {
return ServerResponse.createByErrorMsg("密码错误", request);
@@ -1696,6 +1702,11 @@
}
//价格处理
Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("stock_code", stockDz.getStockCode()));
+
+ UserAssets userAssets = userAssetsServices.assetsByTypeAndUserId(stock.getStockType(), user.getId());
+ if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
+ return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
+ }
if(stockDz.getStartTime().getTime() > new Date().getTime() || stockDz.getEndTime().getTime() < new Date().getTime()){
return ServerResponse.createByErrorMsg("不在内幕交易时间之内", request);
@@ -1721,7 +1732,7 @@
}
//判断审核开关
- if(stockDz.getSwitchType() == 1){
+ if(stockDz.getSwitchType() == 1) {
UserPosition userPosition = getUserPosition(dzId,num, user, stockDz, nowPrice, stock, buyAmt);
UserPositionCheckDz userPositionCheckDz = Convert.convert(UserPositionCheckDz.class, userPosition);
userPositionCheckDz.setDzId(dzId);
@@ -1733,8 +1744,8 @@
UserPosition userPosition = getUserPosition(dzId,num, user, stockDz, nowPrice, stock, buyAmt);
userPositionMapper.insert(userPosition);
BigDecimal buy_fee_amt = siteSettingBuyFee.multiply(buyAmt);
- userAssetsServices.availablebalanceChange(EStockType.IN.getCode(), user.getId(), EUserAssets.BUY, buyAmt.negate(),"","");
- iUserAssetsServices.availablebalanceChange("IN", userAssets.getUserId(), EUserAssets.HANDLING_CHARGE, buy_fee_amt, "", "");
+ userAssetsServices.availablebalanceChange(stock.getStockType(), user.getId(), EUserAssets.BUY, buyAmt.negate(),"","");
+ iUserAssetsServices.availablebalanceChange(stock.getStockType(), userAssets.getUserId(), EUserAssets.HANDLING_CHARGE, buy_fee_amt, "", "");
return ServerResponse.createBySuccess("购买成功", request);
}
@@ -1787,12 +1798,19 @@
@Transactional
public void stockConstraint(List<UserPosition> list) {
try {
- SiteSetting siteSetting = iSiteSettingService.getSiteSetting();
+ //SiteSetting siteSetting = iSiteSettingService.getSiteSetting();
+
+ List<String> stockCodeList = list.stream().map(UserPosition::getStockCode).collect(Collectors.toList());
+ List<Stock> stockList = stockMapper.selectList(new QueryWrapper<Stock>().in("stock_code", stockCodeList));
for (UserPosition position : list) {
+ Stock stock = stockList.stream().filter(x -> x.getStockCode().equals(position.getStockCode())).findFirst().orElse(null);
+ if (stock == null) {
+ stock = stockMapper.findStockByCode(position.getStockCode());
+ }
UserAssets userAssets = userAssetsMapper.selectOne(new LambdaQueryWrapper<UserAssets>()
.eq(UserAssets::getUserId, position.getUserId())
- .eq(UserAssets::getAccectType, "IN")
+ .eq(UserAssets::getAccectType, stock.getStockType())
);
if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
continue;
@@ -1812,6 +1830,34 @@
}
}
+ /**
+ * 获取大宗交易订单
+ * @param pageNum
+ * @param pageSize
+ * @param status
+ * @param request
+ * @return
+ */
+ @Override
+ public ServerResponse getDzOrderList(int pageNum, int pageSize, Integer status, HttpServletRequest request) {
+ try {
+ User user = iUserService.getCurrentUser(request);
+ if (user == null ){
+ return ServerResponse.createByErrorCodeMsg(401,"请先登录");
+ }
+ PageHelper.startPage(pageNum, pageSize);
+ List<UserPositionCheckDz> userPositionCheckDzs = userPositionCheckDzService.list(
+ new QueryWrapper<UserPositionCheckDz>()
+ .eq("user_id", user.getId()).eq(status != null,"check_type", status));
+ // 获取分页信息
+ PageInfo<UserPositionCheckDz> pageInfo = new PageInfo<>(userPositionCheckDzs);
+ return ServerResponse.createBySuccess(pageInfo);
+ } catch (Exception e) {
+ log.error("IUserPositionService getDzOrderList error", e);
+ }
+ return ServerResponse.createByError();
+ }
+
private Result getResult(UserPosition position) {
// 检查订单是否存在
if (position == null) {
--
Gitblit v1.9.3