From 097be94690a981b1b7317aee1861c632d00dc51a Mon Sep 17 00:00:00 2001
From: peter <14100000001@qq.com>
Date: Sun, 31 Aug 2025 16:37:56 +0800
Subject: [PATCH] 修改客服地址
---
src/main/java/com/nq/service/impl/UserPositionServiceImpl.java | 565 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 374 insertions(+), 191 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
index 9e7abbc..0431205 100644
--- a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
@@ -1,5 +1,7 @@
package com.nq.service.impl;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.nq.dao.*;
@@ -13,6 +15,7 @@
import com.google.common.collect.Lists;
import com.nq.common.ServerResponse;
import com.nq.utils.*;
+import com.nq.utils.redis.RedisKeyUtil;
import com.nq.utils.stock.BuyAndSellUtils;
import com.nq.utils.stock.GeneratePosition;
import com.nq.utils.stock.GetStayDays;
@@ -37,6 +40,9 @@
import java.time.ZoneId;
import java.time.temporal.ChronoUnit;
import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -57,6 +63,9 @@
@Autowired
IUserAssetsServices userAssetsServices;
+
+ @Autowired
+ UserAssetsMapper userAssetsMapper;
@Autowired
ISiteSettingService iSiteSettingService;
@@ -118,7 +127,9 @@
IStockConfigServices iStockConfigServices;
@Autowired
- private UserAssetsMapper userAssetsMapper;
+ UserPositionCheckDzService userPositionCheckDzService;
+
+
@Transactional
public ServerResponse buy(Integer stockId, Integer buyNum, Integer buyType, Integer lever, BigDecimal profitTarget, BigDecimal stopTarget, HttpServletRequest request) {
@@ -126,105 +137,107 @@
SiteProduct siteProduct = iSiteProductService.getProductSetting();
User user = this.iUserService.getCurrentRefreshUser(request);
- if (siteProduct.getRealNameDisplay() && user.getIsActive() != 2) {
- return ServerResponse.createByErrorMsg("订单失败，请先实名认证", request);
- }
- // 手续费率
- BigDecimal siteSettingBuyFee = new BigDecimal(iStockConfigServices.queryByKey(EConfigKey.BUY_HANDLING_CHARGE.getCode()).getCValue()) ;
+ synchronized (user.getId()){
+ if (siteProduct.getRealNameDisplay() && user.getIsActive() != 2) {
+ return ServerResponse.createByErrorMsg("订单失败，请先实名认证", request);
+ }
+ // 手续费率
+ BigDecimal siteSettingBuyFee = new BigDecimal(iStockConfigServices.queryByKey(EConfigKey.BUY_HANDLING_CHARGE.getCode()).getCValue()) ;
- if (siteProduct.getRealNameDisplay() && user.getIsLock().intValue() == 1) {
- return ServerResponse.createByErrorMsg("订单失败，帐户已被锁定", request);
- }
+ if (siteProduct.getRealNameDisplay() && user.getIsLock().intValue() == 1) {
+ return ServerResponse.createByErrorMsg("订单失败，帐户已被锁定", request);
+ }
- Stock stock = stockMapper.selectByPrimaryKey(stockId);
- if (stock == null) {
- return ServerResponse.createByErrorMsg("订单失败，股票代码不存在", request);
- }
- //判断股票是否在可交易时间段
- Boolean b = tradingHourService.timeCheck(stock.getStockCode());
- if (!b) {
- return ServerResponse.createByErrorMsg("订单失败,不在交易时间之内", request);
- }
+ Stock stock = stockMapper.selectByPrimaryKey(stockId);
+ if (stock == null) {
+ return ServerResponse.createByErrorMsg("订单失败，股票代码不存在", request);
+ }
+ //判断股票是否在可交易时间段
+ Boolean b = tradingHourService.timeCheck(stock.getStockCode());
+ if (!b) {
+ return ServerResponse.createByErrorMsg("订单失败,不在交易时间之内", request);
+ }
- StockConfig mainBuyConfig = iStockConfigServices.queryByKey(EConfigKey.MIN_BUY.getCode());
+ StockConfig mainBuyConfig = iStockConfigServices.queryByKey(EConfigKey.MIN_BUY.getCode());
- if(buyNum<Integer.parseInt(mainBuyConfig.getCValue())){
- return ServerResponse.createByErrorMsg("最低购买数量"+mainBuyConfig.getCValue(), request);
- }
+ if(buyNum<Integer.parseInt(mainBuyConfig.getCValue())){
+ return ServerResponse.createByErrorMsg("最低购买数量"+mainBuyConfig.getCValue(), request);
+ }
- UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId(stock.getStockType(), user.getId());
- StockConfig maxBuyConfig = iStockConfigServices.queryByKey(EConfigKey.MAX_BUY.getCode());
- if(buyNum<Integer.parseInt(mainBuyConfig.getCValue())){
- return ServerResponse.createByErrorMsg("最高购买数量"+maxBuyConfig.getCValue(), request);
- }
- if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
- return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
- }
- if (stock.getIsLock() != 0) {
- return ServerResponse.createByErrorMsg("订单失败,股票被锁定", request);
- }
+ UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId(stock.getStockType(), user.getId());
+ StockConfig maxBuyConfig = iStockConfigServices.queryByKey(EConfigKey.MAX_BUY.getCode());
+ if(buyNum<Integer.parseInt(mainBuyConfig.getCValue())){
+ return ServerResponse.createByErrorMsg("最高购买数量"+maxBuyConfig.getCValue(), request);
+ }
+ if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
+ return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
+ }
+ if (stock.getIsLock() != 0) {
+ return ServerResponse.createByErrorMsg("订单失败,股票被锁定", request);
+ }
- if (!priceServices.isLimitUpBuy(stock.getStockCode())) {
- return ServerResponse.createByErrorMsg("暂无配额", request);
- }
+ if (!priceServices.isLimitUpBuy(stock.getStockCode())) {
+ return ServerResponse.createByErrorMsg("暂无配额", request);
+ }
- //股票类型 现价 数据源的处理
- BigDecimal nowPrice = priceServices.getNowPrice(stock.getStockCode());
+ //股票类型 现价 数据源的处理
+ BigDecimal nowPrice = priceServices.getNowPrice(stock.getStockCode());
- if (nowPrice.compareTo(new BigDecimal("0")) == 0) {
- return ServerResponse.createByErrorMsg("报价0，请稍后再试", request);
- }
+ if (nowPrice.compareTo(new BigDecimal("0")) == 0) {
+ return ServerResponse.createByErrorMsg("报价0，请稍后再试", request);
+ }
- BigDecimal buyAmt = nowPrice.multiply(new BigDecimal(buyNum)).divide(new BigDecimal(lever));
- BigDecimal orderFree = siteSettingBuyFee.multiply(buyAmt);
+ BigDecimal buyAmt = nowPrice.multiply(new BigDecimal(buyNum)).divide(new BigDecimal(lever));
+ BigDecimal orderFree = siteSettingBuyFee.multiply(buyAmt);
- BigDecimal fundratio = new BigDecimal(user.getFundRatio()).divide(new BigDecimal(100));
- BigDecimal availableBalance = fundratio.multiply(userAssets.getAvailableBalance());
- if (availableBalance.compareTo(buyAmt.add(orderFree)) < 0) {
- return ServerResponse.createByErrorMsg("订单失败，配资不足", request);
- }
- UserPosition userPosition = new UserPosition();
- if (profitTarget != null && profitTarget.compareTo(new BigDecimal("0")) > 0) {
- userPosition.setProfitTargetPrice(profitTarget);
- }
- if (stopTarget != null && stopTarget.compareTo(new BigDecimal("0")) > 0) {
- userPosition.setStopTargetPrice(stopTarget);
- }
- userPosition.setPositionType(user.getAccountType());
- userPosition.setPositionSn(KeyUtils.getUniqueKey());
- userPosition.setUserId(user.getId());
- userPosition.setNickName(user.getRealName());
- userPosition.setAgentId(user.getAgentId());
- userPosition.setStockCode(stock.getStockCode());
- userPosition.setStockName(stock.getStockName());
- userPosition.setStockGid(stock.getStockType());
- userPosition.setStockSpell(stock.getStockSpell());
- userPosition.setBuyOrderId(GeneratePosition.getPositionId());
- userPosition.setBuyOrderTime(new Date());
- userPosition.setBuyOrderPrice(nowPrice);
- userPosition.setOrderDirection((buyType.intValue() == 0) ? "买涨" : "买跌");
- userPosition.setOrderNum(buyNum);
- if (stock.getStockPlate() != null) {
- userPosition.setStockPlate(stock.getStockPlate());
- }
- userPosition.setIsLock(Integer.valueOf(0));
- userPosition.setOrderLever(lever);
- userPosition.setOrderTotalPrice(buyAmt);
- // 手续费
+ BigDecimal fundratio = new BigDecimal(String.valueOf(user.getFundRatio().isEmpty() ? 100 : user.getFundRatio())).divide(new BigDecimal(100));
+ BigDecimal availableBalance = fundratio.multiply(userAssets.getAvailableBalance());
+ if (availableBalance.compareTo(buyAmt.add(orderFree)) < 0) {
+ return ServerResponse.createByErrorMsg("订单失败，配资不足", request);
+ }
+ UserPosition userPosition = new UserPosition();
+ if (profitTarget != null && profitTarget.compareTo(new BigDecimal("0")) > 0) {
+ userPosition.setProfitTargetPrice(profitTarget);
+ }
+ if (stopTarget != null && stopTarget.compareTo(new BigDecimal("0")) > 0) {
+ userPosition.setStopTargetPrice(stopTarget);
+ }
+ userPosition.setPositionType(user.getAccountType());
+ userPosition.setPositionSn(KeyUtils.getUniqueKey());
+ userPosition.setUserId(user.getId());
+ userPosition.setNickName(user.getRealName());
+ userPosition.setAgentId(user.getAgentId());
+ userPosition.setStockCode(stock.getStockCode());
+ userPosition.setStockName(stock.getStockName());
+ userPosition.setStockGid(stock.getStockType());
+ userPosition.setStockSpell(stock.getStockSpell());
+ userPosition.setBuyOrderId(GeneratePosition.getPositionId());
+ userPosition.setBuyOrderTime(new Date());
+ userPosition.setBuyOrderPrice(nowPrice);
+ userPosition.setOrderDirection((buyType.intValue() == 0) ? "买涨" : "买跌");
+ userPosition.setOrderNum(buyNum);
+ if (stock.getStockPlate() != null) {
+ userPosition.setStockPlate(stock.getStockPlate());
+ }
+ userPosition.setIsLock(Integer.valueOf(0));
+ userPosition.setOrderLever(lever);
+ userPosition.setOrderTotalPrice(buyAmt);
+ // 手续费
- userPosition.setOrderFee(orderFree);
- userPosition.setOrderSpread(BigDecimal.ZERO);
- userPosition.setSpreadRatePrice(BigDecimal.ZERO);
- BigDecimal profit_and_lose = new BigDecimal("0");
- userPosition.setProfitAndLose(profit_and_lose);
- userPosition.setAllProfitAndLose(profit_and_lose.add(orderFree));
- 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, "", "");
- return ServerResponse.createBySuccessMsg("下单成功", request);
+ userPosition.setOrderFee(orderFree);
+ userPosition.setOrderSpread(BigDecimal.ZERO);
+ userPosition.setSpreadRatePrice(BigDecimal.ZERO);
+ BigDecimal profit_and_lose = new BigDecimal("0");
+ userPosition.setProfitAndLose(profit_and_lose);
+ userPosition.setAllProfitAndLose(profit_and_lose.add(orderFree));
+ 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, "", "");
+ return ServerResponse.createBySuccessMsg("下单成功", request);
+ }
}
@@ -282,8 +295,18 @@
return ServerResponse.createByErrorMsg("平仓失败，订单不存在");
}
User user = this.userMapper.selectById(userPosition.getUserId());
+ if (user.getIsLock() == 1) {
+ return ServerResponse.createByErrorMsg("账户已被限制交易");
+ }
if (user == null) {
return ServerResponse.createByErrorMsg("平仓失败,用户不存在");
+ }
+ UserAssets userAssets = userAssetsMapper.selectOne(new LambdaQueryWrapper<UserAssets>()
+ .eq(UserAssets::getUserId, userPosition.getUserId())
+ .eq(UserAssets::getAccectType, "JP")
+ );
+ if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
+ return ServerResponse.createByErrorMsg("用户待补资金未补齐，禁止平仓");
}
if (userPosition.getSellOrderId() != null) {
return ServerResponse.createByErrorMsg("平仓失败, 订单已平仓");
@@ -318,24 +341,42 @@
@Transactional
- public ServerResponse sell(String positionSn, int doType, HttpServletRequest request) {
+ public ServerResponse sell(String positionSn, int doType, Integer number,HttpServletRequest request) {
UserPosition userPosition = this.userPositionMapper.findPositionBySn(positionSn);
+ if(null == number || number <= 0 || number > userPosition.getOrderNum()){
+ String msg = "请输入正确的平仓数";
+ if(request.getHeader("lang").equals("ja")){
+ msg ="正しい決済価格を入力してください";
+ return ServerResponse.createByErrorMsg(msg);
+ }else{
+ return ServerResponse.createByErrorMsg(msg, request);
+ }
+ }
// 手续费率
- BigDecimal siitteBuyFee = new BigDecimal(iStockConfigServices.queryByKey(EConfigKey.SELL_HANDLING_CHARGE.getCode()).getCValue()) ;
+ BigDecimal siitteBuyFee = new BigDecimal(iStockConfigServices.queryByKey(EConfigKey.SELL_HANDLING_CHARGE.getCode()).getCValue());
UserAssets userAssets = userAssetsMapper.selectOne(new LambdaQueryWrapper<UserAssets>()
.eq(UserAssets::getUserId, userPosition.getUserId())
- .eq(UserAssets::getAccectType, "IN")
+ .eq(UserAssets::getAccectType, "JP")
);
if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
+ }
+ StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new LambdaQueryWrapper<StockSubscribe>()
+ .eq(StockSubscribe::getCode, userPosition.getStockCode()));
+ 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());
if (!b) {
return ServerResponse.createByErrorMsg("订单失败,不在交易时间之内", request);
}
if(userPosition.getPositionType() == 3){
- StockDz stockDz = stockDzMapper.selectOne(new LambdaQueryWrapper<StockDz>().eq(StockDz::getStockCode, userPosition.getStockCode()));
+ StockDz stockDz = stockDzMapper.selectOne(new LambdaQueryWrapper<StockDz>().eq(StockDz::getId, userPosition.getDzId()));
LocalDateTime buyOrderLocalDateTime = LocalDateTime.ofInstant(userPosition.getBuyOrderTime().toInstant(), ZoneId.systemDefault());
// 计算天数差
long daysBetween = ChronoUnit.DAYS.between(buyOrderLocalDateTime, LocalDateTime.now());
@@ -347,6 +388,9 @@
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);
}
@@ -356,7 +400,6 @@
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()));
if (!priceServices.isLimitDownSell(stock.getStockCode())) {
return ServerResponse.createByErrorMsg("股票跌停,无法平仓", request);
}
@@ -364,12 +407,42 @@
if (nowPrice.compareTo(new BigDecimal("0")) != 1) {
return ServerResponse.createByErrorMsg("报价0，平仓失败，请稍后再试", request);
}
+
+ //部分平仓
+ if(number < userPosition.getOrderNum()){
+ //拆分订单
+ UserPosition position = ConverterUtil.convert(userPosition,UserPosition.class);
+ position.setId(null);
+ position.setPositionSn(KeyUtils.getUniqueKey());
+ position.setOrderNum(number);
+ position.setOrderTotalPrice(position.getBuyOrderPrice().multiply(new BigDecimal(number)));
+ position.setBuyOrderId(GeneratePosition.getPositionId());
+ //修改拆分订单手续费
+ BigDecimal BuyFee = new BigDecimal(iStockConfigServices.queryByKey(EConfigKey.BUY_HANDLING_CHARGE.getCode()).getCValue());
+ BigDecimal buyPrice = position.getBuyOrderPrice().multiply(new BigDecimal(position.getOrderNum()));
+ BigDecimal xsPrice = buyPrice.multiply(BuyFee);
+ position.setOrderFee(xsPrice);
+
+ //修改原订单
+ userPosition.setOrderNum(userPosition.getOrderNum()-number);
+ userPosition.setOrderTotalPrice(userPosition.getBuyOrderPrice().multiply(new BigDecimal(userPosition.getOrderNum())));
+ userPosition.setOrderFee(userPosition.getOrderFee().subtract(position.getOrderFee()));
+ userPositionMapper.insert(position);
+ userPositionMapper.updateById(userPosition);
+
+ return getObjectServerResponse(request, position, nowPrice, siitteBuyFee, stock);
+ }
+ return getObjectServerResponse(request, userPosition, nowPrice, siitteBuyFee, stock);
+ }
+
+ private ServerResponse<Object> getObjectServerResponse(HttpServletRequest request, UserPosition userPosition, BigDecimal nowPrice, BigDecimal siitteBuyFee, Stock stock) {
userPosition.setSellOrderId(GeneratePosition.getPositionId());
userPosition.setSellOrderPrice(nowPrice);
userPosition.setSellOrderTime(new Date());
BigDecimal sellOrderTotel = nowPrice.multiply(new BigDecimal(userPosition.getOrderNum()));
BigDecimal xsPrice = sellOrderTotel.multiply(siitteBuyFee);
+ userPosition.setOrderFee(userPosition.getOrderFee().add(xsPrice));
userPositionMapper.updateById(userPosition);
userAssetsServices.availablebalanceChange(stock.getStockType(),
userPosition.getUserId(),
@@ -561,7 +634,6 @@
Integer state, HttpServletRequest request,
int pageNum, int pageSize, String stockType) {
User user = this.iUserService.getCurrentUser(request);
-
PageHelper.startPage(pageNum, pageSize);
List<UserPosition> userPositions;
@@ -576,7 +648,34 @@
List<UserPositionVO> userPositionVOS = Lists.newArrayList();
if (userPositions.size() > 0) {
for (UserPosition position : userPositions) {
- UserPositionVO userPositionVO = UserPointUtil.assembleUserPositionVO(position, priceServices.getNowPrice(position.getStockCode()));
+ BigDecimal nowPrice = BigDecimal.ZERO;
+ if(state == 0){
+ nowPrice = priceServices.getNowPrice(position.getStockCode());
+ }else{
+ nowPrice = position.getSellOrderPrice();
+ }
+//// if(state == 1){
+//// nowPrice = position.getSellOrderPrice();
+//// }else{
+//// nowPrice = priceServices.getNowPrice(position.getStockCode());
+//// }
+ UserPositionVO userPositionVO = UserPointUtil.assembleUserPositionVO(position,nowPrice);
+ userPositionVO.setOrderTotalPrice(userPositionVO.getOrderTotalPrice().multiply(new BigDecimal(userPositionVO.getOrderLever())));
+
+ StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new LambdaQueryWrapper<StockSubscribe>()
+ .eq(StockSubscribe::getCode, userPositionVO.getStockCode()));
+ if(position.getSellOrderId() == null){
+ if (null != stockSubscribe && DateUtil.date().before(stockSubscribe.getListDate())) {
+ userPositionVO.setProfitAndLose(BigDecimal.ZERO);
+ userPositionVO.setProfitAndLoseParent("0%");
+ userPositionVO.setIsListed(false);
+ }else{
+ userPositionVO.setIsListed(true);
+ userPositionVO.setProfitAndLose(userPositionVO.getProfitAndLose().multiply(new BigDecimal(userPositionVO.getOrderLever())));
+ }
+ }else{
+ userPositionVO.setProfitAndLose(userPositionVO.getProfitAndLose().multiply(new BigDecimal(userPositionVO.getOrderLever())));
+ }
userPositionVOS.add(userPositionVO);
}
}
@@ -672,11 +771,17 @@
end_time = DateTimeUtil.searchStrToTimestamp(endTime);
}
+
+
+
+ List<Integer> ids = new ArrayList<>();
+ if(null != searchId){
+ ids = getSubordinates(searchId);
+ ids.add(searchId);
+ }
PageHelper.startPage(pageNum, pageSize);
-
-
List<UserPosition> userPositions = this.userPositionMapper.listByAgent(positionType, state,
- userId, searchId, positionSn, begin_time, end_time,null);
+ userId, ids, positionSn, begin_time, end_time,null);
List<AgentPositionVO> agentPositionVOS = Lists.newArrayList();
for (UserPosition position : userPositions) {
@@ -705,8 +810,14 @@
}
+ List<Integer> ids = new ArrayList<>();
+ if(null != agentId){
+ ids = getSubordinates(agentId);
+ ids.add(agentId);
+ }
+
List<UserPosition> userPositions = this.userPositionMapper.listByAgent(positionType, Integer.valueOf(1),
- null, agentId, null, begin_time, end_time,null);
+ null, ids, null, begin_time, end_time,null);
BigDecimal order_fee_amt = new BigDecimal("0");
@@ -738,15 +849,38 @@
if (StringUtils.isNotBlank(endTime)) {
end_time = DateTimeUtil.searchStrToTimestamp(endTime);
}
- List<UserPosition> userPositions = this.userPositionMapper.listByAgent(positionType, state, userId, agentId, positionSn, begin_time, end_time,phone);
+ List<Integer> ids = new ArrayList<>();
+ if(null != agentId){
+ ids = getSubordinates(agentId);
+ ids.add(agentId);
+ }
+
+
+ List<UserPosition> userPositions = this.userPositionMapper.listByAgent(positionType, state, userId, ids, positionSn, begin_time, end_time,phone);
List<AdminPositionVO> adminPositionVOS = Lists.newArrayList();
for (UserPosition position : userPositions) {
AdminPositionVO adminPositionVO = assembleAdminPositionVO(position);
+ AgentUser agentUser = agentUserMapper.selectById(adminPositionVO.getAgentId());
+ adminPositionVO.setAgentName(agentUser.getAgentName());
+ User user = userMapper.selectById(adminPositionVO.getUserId());
+ adminPositionVO.setPhone(user.getPhone());
adminPositionVOS.add(adminPositionVO);
}
PageInfo pageInfo = new PageInfo(userPositions);
pageInfo.setList(adminPositionVOS);
return ServerResponse.createBySuccess(pageInfo);
+ }
+
+ public List<Integer> getSubordinates(Integer id) {
+ List<AgentUser> agentUsers = agentUserMapper.selectList(new LambdaQueryWrapper<AgentUser>());
+ List<Integer> subordinates = new ArrayList<>();
+ for (AgentUser user : agentUsers) {
+ if (id.equals(user.getParentId())) {
+ subordinates.add(user.getId());
+ subordinates.addAll(getSubordinates(user.getId()));
+ }
+ }
+ return subordinates;
}
public int CountPositionNum(Integer state, Integer accountType) {
@@ -1088,7 +1222,14 @@
private AgentPositionVO assembleAgentPositionVO(UserPosition position) {
AgentPositionVO agentPositionVO = new AgentPositionVO();
-
+ User user = userMapper.selectById(position.getUserId());
+ if(null != user){
+ AgentUser agentUser = agentUserMapper.selectById(user.getAgentId());
+ agentPositionVO.setPhone(user.getPhone());
+ if(null != agentUser){
+ agentPositionVO.setAgentName(agentUser.getAgentName());
+ }
+ }
agentPositionVO.setId(position.getId());
agentPositionVO.setPositionSn(position.getPositionSn());
agentPositionVO.setPositionType(position.getPositionType());
@@ -1170,99 +1311,113 @@
* @Date: 2022/10/26
*/
@Override
- public ServerResponse newStockToPosition(Integer id) {
+ public ServerResponse newStockToPosition(Integer id,BigDecimal amountToBeCovered) {
UserStockSubscribe userStockSubscribe = userStockSubscribeMapper.load(id);
if (userStockSubscribe == null) {
return ServerResponse.createByErrorMsg("无该申购记录");
}
- StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<StockSubscribe>().eq("code", userStockSubscribe.getNewCode()).eq("type",userStockSubscribe.getType()));
+ StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<StockSubscribe>().eq("newlist_id", userStockSubscribe.getNewStockId()));
if (userStockSubscribe == null) {
return ServerResponse.createByErrorMsg("该新股不存在");
}
- if (userStockSubscribe.getStatus() == 4 || userStockSubscribe.getStatus() == 3 && stockSubscribe.getType() == 2) {
- Stock stock = stockMapper.selectOne(new LambdaQueryWrapper<Stock>().eq(Stock::getStockCode, userStockSubscribe.getNewCode()));
- if(null == stock){
- return ServerResponse.createByErrorMsg("该新股不存在");
- }
- UserPosition userPosition = new UserPosition();
- userPosition.setPositionType(1);
- userPosition.setPositionSn(KeyUtils.getUniqueKey());
- userPosition.setUserId(userStockSubscribe.getUserId());
- userPosition.setNickName(userStockSubscribe.getRealName());
- userPosition.setAgentId(userStockSubscribe.getAgentId());
+
+ Stock stock = stockMapper.selectOne(new LambdaQueryWrapper<Stock>().eq(Stock::getStockCode, userStockSubscribe.getNewCode()));
+
+ UserPosition userPosition = new UserPosition();
+
+ if(null == stock){
+ userPosition.setStockCode(stockSubscribe.getCode());
+ userPosition.setStockSpell(stockSubscribe.getName());
+ }else{
userPosition.setStockCode(stock.getStockCode());
userPosition.setStockSpell(stock.getStockSpell());
- userPosition.setStockName(userStockSubscribe.getNewName());
- userPosition.setStockGid(stockSubscribe.getStockType() + userStockSubscribe.getNewCode());
+ }
- userPosition.setBuyOrderId(GeneratePosition.getPositionId());
- userPosition.setBuyOrderTime(new Date());
- userPosition.setBuyOrderPrice(userStockSubscribe.getBuyPrice());
- userPosition.setOrderDirection("买涨");
+ userPosition.setPositionType(1);
+ userPosition.setPositionSn(KeyUtils.getUniqueKey());
+ userPosition.setUserId(userStockSubscribe.getUserId());
+ userPosition.setNickName(userStockSubscribe.getRealName());
+ userPosition.setAgentId(userStockSubscribe.getAgentId());
- userPosition.setOrderNum(userStockSubscribe.getApplyNumber());
+ userPosition.setStockName(userStockSubscribe.getNewName());
+// StringBuffer gid = new StringBuffer();
+// gid.append(stockSubscribe.getStockType()!=null?stockSubscribe.getStockType():"");
+// gid.append(userStockSubscribe.getNewCode()!=null?userStockSubscribe.getNewCode():"stock code invaild");
+ userPosition.setStockGid("JP");
+ userPosition.setBuyOrderId(GeneratePosition.getPositionId());
+ userPosition.setBuyOrderTime(new Date());
+ userPosition.setBuyOrderPrice(userStockSubscribe.getBuyPrice());
+ userPosition.setOrderDirection("买涨");
+
+ userPosition.setOrderNum(userStockSubscribe.getApplyNumber());
- userPosition.setIsLock(Integer.valueOf(0));
+ userPosition.setIsLock(Integer.valueOf(0));
- userPosition.setOrderLever(10);
+ userPosition.setOrderLever(1);
- //递延费特殊处理
- // BigDecimal stayFee = userPosition.getOrderTotalPrice().multiply(siteSetting.getStayFee());
- BigDecimal stayFee = new BigDecimal(0);
- BigDecimal allStayFee = stayFee.multiply(new BigDecimal(1));
- userPosition.setOrderStayFee(allStayFee);
- userPosition.setOrderStayDays(1);
- userPosition.setOrderTotalPrice(userStockSubscribe.getBond());
+ //递延费特殊处理
+ // BigDecimal stayFee = userPosition.getOrderTotalPrice().multiply(siteSetting.getStayFee());
+ BigDecimal stayFee = new BigDecimal(0);
+ BigDecimal allStayFee = stayFee.multiply(new BigDecimal(1));
+ userPosition.setOrderStayFee(allStayFee);
+ userPosition.setOrderStayDays(1);
+ userPosition.setOrderTotalPrice(userStockSubscribe.getBond());
- // BigDecimal buy_fee_amt = buy_amt.multiply(siteSetting.getBuyFee()).setScale(2, 4);
- BigDecimal buy_fee_amt = new BigDecimal(0);
- log.info("用户购买手续费（配资后总资金 * 百分比） = {}", buy_fee_amt);
- userPosition.setOrderFee(buy_fee_amt);
+ // BigDecimal buy_fee_amt = buy_amt.multiply(siteSetting.getBuyFee()).setScale(2, 4);
+ // 手续费率
+ BigDecimal siteSettingBuyFee = new BigDecimal(iStockConfigServices.queryByKey(EConfigKey.BUY_HANDLING_CHARGE.getCode()).getCValue()) ;
+ BigDecimal buy_fee_amt = siteSettingBuyFee.multiply(userStockSubscribe.getBond());
+ log.info("用户购买手续费（配资后总资金 * 百分比） = {}", buy_fee_amt);
+ userPosition.setOrderFee(buy_fee_amt);
- // BigDecimal buy_yhs_amt = buy_amt.multiply(siteSetting.getDutyFee()).setScale(2, 4);
- BigDecimal buy_yhs_amt = new BigDecimal(0);
- log.info("用户购买印花税（配资后总资金 * 百分比） = {}", buy_yhs_amt);
- userPosition.setOrderSpread(buy_yhs_amt);
+ // BigDecimal buy_yhs_amt = buy_amt.multiply(siteSetting.getDutyFee()).setScale(2, 4);
+ BigDecimal buy_yhs_amt = new BigDecimal(0);
+ log.info("用户购买印花税（配资后总资金 * 百分比） = {}", buy_yhs_amt);
+ userPosition.setOrderSpread(buy_yhs_amt);
- BigDecimal spread_rate_amt = new BigDecimal(0);
- userPosition.setSpreadRatePrice(spread_rate_amt);
+ BigDecimal spread_rate_amt = new BigDecimal(0);
+ userPosition.setSpreadRatePrice(spread_rate_amt);
- BigDecimal profit_and_lose = new BigDecimal("0");
- userPosition.setProfitAndLose(profit_and_lose);
+ BigDecimal profit_and_lose = new BigDecimal("0");
+ userPosition.setProfitAndLose(profit_and_lose);
- BigDecimal all_profit_and_lose = profit_and_lose.subtract(buy_fee_amt).subtract(buy_yhs_amt).subtract(spread_rate_amt);
- userPosition.setAllProfitAndLose(all_profit_and_lose);
+ BigDecimal all_profit_and_lose = profit_and_lose.subtract(buy_fee_amt).subtract(buy_yhs_amt).subtract(spread_rate_amt);
+ userPosition.setAllProfitAndLose(all_profit_and_lose);
- userPosition.setOrderStayDays(Integer.valueOf(0));
- userPosition.setOrderStayFee(new BigDecimal("0"));
-
- int ret = 0;
- ret = this.userPositionMapper.insert(userPosition);
-
+ userPosition.setOrderStayDays(Integer.valueOf(0));
+ userPosition.setOrderStayFee(new BigDecimal("0"));
+ userPosition.setAmountToBeCovered(amountToBeCovered);
+ userPosition.setNewId(stockSubscribe.getNewlistId());
+ int ret = 0;
+ ret = this.userPositionMapper.insert(userPosition);
+ UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId("JP", userPosition.getUserId());
+ if(null == userAssets){
+ return ServerResponse.createByErrorMsg("新股转持仓失败");
+ }
+ userAssetsMapper.updateById(userAssets);
+ iUserAssetsServices.availablebalanceChange("JP", userAssets.getUserId(), EUserAssets.HANDLING_CHARGE, buy_fee_amt, "", "");
+ if (ret > 0) {
+ userStockSubscribe.setStatus(5);
+ userStockSubscribeMapper.update1(userStockSubscribe);
+ if (userStockSubscribe.getType() == 1 || userStockSubscribe.getType() == 2) {
+ User user = userMapper.selectById(userStockSubscribe.getUserId());
+ ret = userMapper.updateById(user);
+ }
if (ret > 0) {
- userStockSubscribe.setStatus(5);
- userStockSubscribeMapper.update1(userStockSubscribe);
- if (userStockSubscribe.getType() == 1 || userStockSubscribe.getType() == 2) {
- User user = userMapper.selectById(userStockSubscribe.getUserId());
- ret = userMapper.updateById(user);
- }
- if (ret > 0) {
- return ServerResponse.createBySuccessMsg("新股转持仓成功");
- } else {
- return ServerResponse.createByErrorMsg("新股转持仓失败");
- }
+ return ServerResponse.createBySuccessMsg("新股转持仓成功");
} else {
return ServerResponse.createByErrorMsg("新股转持仓失败");
}
+ } else {
+ return ServerResponse.createByErrorMsg("新股转持仓失败");
}
- return ServerResponse.createByErrorMsg("新股转持仓失败");
}
/**
@@ -1530,22 +1685,23 @@
* @return
*/
@Transactional
- public ServerResponse buyDz(String stockCode, String password, Integer num, HttpServletRequest request) throws Exception {
+ public ServerResponse buyDz(Integer dzId, String password, Integer num, HttpServletRequest request) throws Exception {
/*实名认证开关开启*/
SiteProduct siteProduct = iSiteProductService.getProductSetting();
User user = this.iUserService.getCurrentRefreshUser(request);
+
if (siteProduct.getRealNameDisplay() && user.getIsActive() != 2) {
return ServerResponse.createByErrorMsg("Order failed, please first real name authentication");
}
if (siteProduct.getRealNameDisplay() && user.getIsLock().intValue() == 1) {
return ServerResponse.createByErrorMsg("Order failed, account has been locked");
}
- UserAssets userAssets = userAssetsServices.assetsByTypeAndUserId("IN", user.getId());
+ UserAssets userAssets = userAssetsServices.assetsByTypeAndUserId("JP", user.getId());
if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
}
- StockDz stockDz = this.stockDzMapper.selectOne(new QueryWrapper<StockDz>().eq("stock_code", stockCode));
- if (!Objects.equals(stockDz.getPassword(), password)) {
+ 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);
}
if (stockDz.getIsLock() != 0) {
@@ -1557,7 +1713,8 @@
if(stockDz.getStartTime().getTime() > new Date().getTime() || stockDz.getEndTime().getTime() < new Date().getTime()){
return ServerResponse.createByErrorMsg("不在内幕交易时间之内", request);
}
- BigDecimal nowPrice = priceServices.getNowPrice(stockCode).multiply(stockDz.getDiscount());
+// BigDecimal nowPrice = priceServices.getNowPrice(stockDz.getStockCode()).multiply(stockDz.getDiscount());
+ BigDecimal nowPrice = stockDz.getNowPrice();
if (nowPrice.compareTo(new BigDecimal("0")) == 0) {
return ServerResponse.createByErrorMsg("股票价格0,请重试", request);
@@ -1565,12 +1722,36 @@
if (stockDz.getStockNum() > num) {
return ServerResponse.createByErrorMsg("最小购买数据" + stockDz.getStockNum(), request);
}
+
+ BigDecimal siteSettingBuyFee = new BigDecimal(iStockConfigServices.queryByKey(EConfigKey.BUY_HANDLING_CHARGE.getCode()).getCValue()) ;
+
BigDecimal buyAmt = nowPrice.multiply(new BigDecimal(num.intValue()));
- BigDecimal fundratio = new BigDecimal(user.getFundRatio()).divide(new BigDecimal(100));
- BigDecimal availableBalance = fundratio.multiply(userAssets.getAvailableBalance());
- if (buyAmt.compareTo(availableBalance) > 0) {
+ BigDecimal orderFree = siteSettingBuyFee.multiply(buyAmt);
+ BigDecimal fundratio = new BigDecimal(user.getFundRatio()).divide(new BigDecimal(100));
+ BigDecimal availableBalance = fundratio.multiply(userAssets.getAvailableBalance());
+ if (availableBalance.compareTo(buyAmt.add(orderFree)) < 0) {
return ServerResponse.createByErrorMsg("订单失败，配资不足", request);
}
+
+ //判断审核开关
+ if(stockDz.getSwitchType() == 1){
+ UserPosition userPosition = getUserPosition(dzId,num, user, stockDz, nowPrice, stock, buyAmt);
+ UserPositionCheckDz userPositionCheckDz = Convert.convert(UserPositionCheckDz.class, userPosition);
+ userPositionCheckDz.setDzId(dzId);
+ userPositionCheckDzService.save(userPositionCheckDz);
+ return ServerResponse.createBySuccess("购买成功，等待审核", request);
+ }
+
+ // 创建UserPosition对象
+ UserPosition userPosition = getUserPosition(dzId,num, user, stockDz, nowPrice, stock, buyAmt);
+ userPositionMapper.insert(userPosition);
+ BigDecimal buy_fee_amt = siteSettingBuyFee.multiply(buyAmt);
+ userAssetsServices.availablebalanceChange(EStockType.JP.getCode(), user.getId(), EUserAssets.BUY, buyAmt.negate(),"","");
+ iUserAssetsServices.availablebalanceChange("JP", userAssets.getUserId(), EUserAssets.HANDLING_CHARGE, buy_fee_amt, "", "");
+ return ServerResponse.createBySuccess("购买成功", request);
+ }
+
+ private UserPosition getUserPosition(Integer dzId,Integer num, User user, StockDz stockDz, BigDecimal nowPrice, Stock stock, BigDecimal buyAmt) {
UserPosition userPosition = new UserPosition();
userPosition.setPositionType(3);
userPosition.setPositionSn(KeyUtils.getUniqueKey());
@@ -1579,7 +1760,7 @@
userPosition.setAgentId(user.getAgentId());
userPosition.setStockCode(stockDz.getStockCode());
userPosition.setStockName(stockDz.getStockName());
- userPosition.setStockGid(stockDz.getStockGid());
+ userPosition.setStockGid(stockDz.getStockType());
userPosition.setBuyOrderId(GeneratePosition.getPositionId());
userPosition.setBuyOrderTime(new Date());
userPosition.setBuyOrderPrice(nowPrice);
@@ -1599,11 +1780,9 @@
userPosition.setAllProfitAndLose(all_profit_and_lose);
userPosition.setOrderStayDays(Integer.valueOf(0));
userPosition.setOrderStayFee(new BigDecimal("0"));
-
userPosition.setOrderSpread(BigDecimal.ZERO);
- userPositionMapper.insert(userPosition);
- userAssetsServices.availablebalanceChange(EStockType.IN.getCode(), user.getId(), EUserAssets.BUY, buyAmt.negate(),"","");
- return ServerResponse.createBySuccess("购买成功", request);
+ userPosition.setDzId(dzId);
+ return userPosition;
}
@Override
@@ -1620,25 +1799,29 @@
@Override
@Transactional
public void stockConstraint(List<UserPosition> list) {
- SiteSetting siteSetting = iSiteSettingService.getSiteSetting();
+ try {
+ SiteSetting siteSetting = iSiteSettingService.getSiteSetting();
- for (UserPosition position : list) {
- UserAssets userAssets = userAssetsMapper.selectOne(new LambdaQueryWrapper<UserAssets>()
- .eq(UserAssets::getUserId, position.getUserId())
- .eq(UserAssets::getAccectType, "IN")
- );
- if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
- continue;
- }
- //平仓检查
- Result result = getResult(position);
- if (result == null) continue;
+ for (UserPosition position : list) {
+ UserAssets userAssets = userAssetsMapper.selectOne(new LambdaQueryWrapper<UserAssets>()
+ .eq(UserAssets::getUserId, position.getUserId())
+ .eq(UserAssets::getAccectType, "JP")
+ );
+ if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
+ continue;
+ }
+ //平仓检查
+ Result result = getResult(position);
+ if (result == null) continue;
- Integer liquidation = 0;
- liquidation = isLiquidation(position, result.signum, result.profit, liquidation);
- if(liquidation != 0){
- extracted(position, result.nowPrice, result.stock,liquidation);
+ Integer liquidation = 0;
+ liquidation = isLiquidation(position, result.signum, result.profit, liquidation);
+ if(liquidation != 0){
+ extracted(position, result.nowPrice, result.stock,liquidation);
+ }
}
+ }catch (Exception e){
+ log.error("强制平仓--->错误",e);
}
}
--
Gitblit v1.9.3