From 25e4c6e9e903a6035777b0a6b304df307711ba5d Mon Sep 17 00:00:00 2001
From: peter <14100000001@qq.com>
Date: Sat, 15 Nov 2025 14:22:01 +0800
Subject: [PATCH] 修改购买金额问题
---
src/main/java/com/nq/service/impl/UserPositionServiceImpl.java | 130 ++++++++++++++++++++++++++++++------------
1 files changed, 92 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
index 1cdf50b..2857d0f 100644
--- a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
@@ -35,6 +35,7 @@
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.sql.Timestamp;
import java.time.LocalDateTime;
import java.time.ZoneId;
@@ -128,11 +129,13 @@
@Autowired
UserPositionCheckDzService userPositionCheckDzService;
+ @Autowired
+ UserPendingorderMapper userPendingorderMapper;
@Transactional
- public ServerResponse buy(Integer stockId, Integer buyNum, Integer buyType, Integer lever, BigDecimal profitTarget, BigDecimal stopTarget, HttpServletRequest request) {
+ public ServerResponse buy(Integer stockId, Integer buyNum, Integer buyType, Integer lever, BigDecimal profitTarget, BigDecimal stopTarget,BigDecimal preMarketPrice, HttpServletRequest request) {
SiteProduct siteProduct = iSiteProductService.getProductSetting();
@@ -203,37 +206,65 @@
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);
- // 手续费
+ //判断是否盘前，和价格
+ StockSetting stockSetting = tradingHourService.preMarketPrice(stock.getStockCode());
+ if(null != preMarketPrice && preMarketPrice.compareTo(new BigDecimal(0)) > 0 && null != stockSetting && preMarketPrice.compareTo(new BigDecimal(stockSetting.getPrice())) != 0){
+ //挂单
+ UserPendingorder userPendingorder = new UserPendingorder();
+ userPendingorder.setUserId(user.getId());
+ userPendingorder.setStockId(String.valueOf(stockId));
+ userPendingorder.setBuyNum(buyNum);
+ userPendingorder.setBuyType(buyType);
+ userPendingorder.setLever(lever);
+ userPendingorder.setProfitTarget(profitTarget);
+ userPendingorder.setStopTarget(stopTarget);
+ userPendingorder.setNowPrice(new BigDecimal(0));
+ userPendingorder.setTargetPrice(preMarketPrice);
+ userPendingorder.setAddTime(new Date());
+ userPendingorder.setStatus(0);
+ userPendingorder.setBuyAmt(preMarketPrice.multiply(new BigDecimal(buyNum)).divide(new BigDecimal(lever)));
+ int ret = userPendingorderMapper.insert(userPendingorder);
+ buyAmt = userPendingorder.getBuyAmt();
+ orderFree = siteSettingBuyFee.multiply(buyAmt);
+ }else {
+ 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(null == preMarketPrice ? nowPrice : preMarketPrice);
+ if(null == preMarketPrice){
+ userPosition.setBuyOrderPrice(nowPrice);
+ }else {
+ userPosition.setBuyOrderPrice(preMarketPrice);
+ buyAmt = preMarketPrice.multiply(new BigDecimal(buyNum)).divide(new BigDecimal(lever));
+ }
+ 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);
- 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);
@@ -448,20 +479,39 @@
return ServerResponse.createBySuccessMsg("平仓成功!", request);
}
- @Transactional
@Override
- public ServerResponse allSell(HttpServletRequest request, String stockType) throws Exception {
- //判断股票是否在可交易时间段
+ public ServerResponse allSell(HttpServletRequest request) throws Exception {
User user = iUserService.getCurrentUser(request);
QueryWrapper<UserPosition> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("user_id", user.getId());
queryWrapper.isNull("sell_order_id");
List<UserPosition> userPositionList = userPositionMapper.selectList(queryWrapper);
- for (int i = 0; i < userPositionList.size(); i++) {
- sell(userPositionList.get(i).getPositionSn(), 0);
+
+ // 如果没有需要平仓的持仓
+ if (userPositionList.isEmpty()) {
+ return ServerResponse.createBySuccessMsg("没有需要平仓的持仓订单");
}
- return ServerResponse.createBySuccessMsg("平仓成功!");
+
+ // 收集所有提示信息
+ List<String> successMessages = new ArrayList<>();
+ List<String> errorMessages = new ArrayList<>();
+
+ for (UserPosition position : userPositionList) {
+ ServerResponse response = sell(position.getPositionSn(), 0, position.getOrderNum(), request);
+
+ if (response.getStatus() != 0) {
+ // 失败的情况
+ errorMessages.add("订单号：" + position.getPositionSn() + " 失败，原因：" + response.getMsg());
+ }
+ }
+
+ // 根据是否有错误返回不同的状态
+ if (!errorMessages.isEmpty()) {
+ return ServerResponse.createByErrorMsg(errorMessages.toString(), request);
+ } else {
+ return ServerResponse.createBySuccessMsg("平仓成功!", request);
+ }
}
//用户追加保证金操作
@@ -662,6 +712,11 @@
}
}else{
userPositionVO.setProfitAndLose(userPositionVO.getProfitAndLose().multiply(new BigDecimal(userPositionVO.getOrderLever())));
+ }
+ Stock stock = stockMapper.findStockByCode(position.getStockCode());
+ if(null != stock){
+ userPositionVO.setStockId(stock.getId().toString());
+ userPositionVO.setStockGidJb(stock.getStockGid());
}
userPositionVOS.add(userPositionVO);
}
@@ -1325,7 +1380,6 @@
userPosition.setUserId(userStockSubscribe.getUserId());
userPosition.setNickName(userStockSubscribe.getRealName());
userPosition.setAgentId(userStockSubscribe.getAgentId());
-
userPosition.setStockName(userStockSubscribe.getNewName());
// StringBuffer gid = new StringBuffer();
// gid.append(stockSubscribe.getStockType()!=null?stockSubscribe.getStockType():"");
--
Gitblit v1.9.3