From 716f77637e6e324fd5865e82039c2c2ee3f94bfa Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 14 Jan 2026 15:53:06 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/UserPositionServiceImpl.java | 84 +++++++++++++++++++-----------------------
1 files changed, 38 insertions(+), 46 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
index 685f6d0..8aeaa6b 100644
--- a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
@@ -171,7 +171,7 @@
StockBuySetting stockBuySetting = stockBuySettingMapper.selectOne(new QueryWrapper<StockBuySetting>().eq("accets_type", stock.getStockType()));
if (stockBuySetting != null && stockBuySetting.getHandsNum() != null && stockBuySetting.getStockNum() != null) {
if(buyNum < stockBuySetting.getHandsNum()){
- return ServerResponse.createByErrorMsg("最低购买手数" + stockBuySetting.getHandsNum(), request);
+ return ServerResponse.createByErrorMsg("最低购买数量" + stockBuySetting.getHandsNum(), request);
}
buyNum = buyNum * stockBuySetting.getStockNum();
}
@@ -486,18 +486,38 @@
@Transactional(rollbackFor = Exception.class)
@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);
+ }
}
//用户追加保证金操作
@@ -2135,28 +2155,18 @@
null, null, state, null);
BigDecimal usMarketValue = BigDecimal.ZERO; //美股市值
- BigDecimal hkMarketValue = BigDecimal.ZERO; //港股市值
- BigDecimal inMarketValue = BigDecimal.ZERO; //印股市值
- BigDecimal twMarketValue = BigDecimal.ZERO; //台股市值
+ BigDecimal jpMarketValue = BigDecimal.ZERO; //日股市值
BigDecimal usPositionEarnings = BigDecimal.ZERO; //美股持仓收益
- BigDecimal hkPositionEarnings = BigDecimal.ZERO; //港股持仓收益
- BigDecimal inPositionEarnings = BigDecimal.ZERO; //印股持仓收益
- BigDecimal twPositionEarnings = BigDecimal.ZERO; //台股持仓收益
+ BigDecimal jpPositionEarnings = BigDecimal.ZERO; //日股持仓收益
BigDecimal usPositionEarningsParent = BigDecimal.ZERO; //美股持仓收益百分比
- BigDecimal hkPositionEarningsParent = BigDecimal.ZERO; //港股持仓收益百分比
- BigDecimal inPositionEarningsParent = BigDecimal.ZERO; //印股持仓收益百分比
- BigDecimal twPositionEarningsParent = BigDecimal.ZERO; //台股持仓收益百分比
+ BigDecimal jpPositionEarningsParent = BigDecimal.ZERO; //日股持仓收益百分比
if (!userPositions.isEmpty()) {
for (UserPosition position : userPositions) {
BigDecimal nowPrice = priceServices.getNowPrice(position.getStockCode());
- /*if(state == 0){
- nowPrice = priceServices.getNowPrice(position.getStockCode());
- }else{
- nowPrice = position.getSellOrderPrice();
- }*/
+
UserPositionVO userPositionVO = UserPointUtil.assembleUserPositionVO(position,nowPrice);
userPositionVO.setOrderTotalPrice(userPositionVO.getOrderTotalPrice().multiply(new BigDecimal(userPositionVO.getOrderLever())));
@@ -2180,25 +2190,15 @@
usMarketValue = usMarketValue.add(nowPriceSUM);
usPositionEarnings = usPositionEarnings.add(userPositionVO.getProfitAndLose());
usPositionEarningsParent = usPositionEarningsParent.add(userPositionVO.getProfitAndLoseParent2());
- } else if(position.getStockGid().equals(EStockType.HK.getCode())) {
- hkMarketValue = hkMarketValue.add(nowPriceSUM);
- hkPositionEarnings = hkPositionEarnings.add(userPositionVO.getProfitAndLose());
- hkPositionEarningsParent = hkPositionEarningsParent.add(userPositionVO.getProfitAndLoseParent2());
- } else if(position.getStockGid().equals(EStockType.IN.getCode())) {
- inMarketValue = inMarketValue.add(nowPriceSUM);
- inPositionEarnings = inPositionEarnings.add(userPositionVO.getProfitAndLose());
- inPositionEarningsParent = inPositionEarningsParent.add(userPositionVO.getProfitAndLoseParent2());
- } else if(position.getStockGid().equals(EStockType.TW.getCode())) {
- twMarketValue = twMarketValue.add(nowPriceSUM);
- twPositionEarnings = twPositionEarnings.add(userPositionVO.getProfitAndLose());
- twPositionEarningsParent = twPositionEarningsParent.add(userPositionVO.getProfitAndLoseParent2());
+ } else if(position.getStockGid().equals(EStockType.JP.getCode())) {
+ jpMarketValue = jpMarketValue.add(nowPriceSUM);
+ jpPositionEarnings = jpPositionEarnings.add(userPositionVO.getProfitAndLose());
+ jpPositionEarningsParent = jpPositionEarningsParent.add(userPositionVO.getProfitAndLoseParent2());
}
}
usPositionEarnings = usPositionEarnings.setScale(2, RoundingMode.DOWN);
- hkPositionEarnings = hkPositionEarnings.setScale(2, RoundingMode.DOWN);
- inPositionEarnings = inPositionEarnings.setScale(2, RoundingMode.DOWN);
- twPositionEarnings = twPositionEarnings.setScale(2, RoundingMode.DOWN);
+ jpPositionEarnings = jpPositionEarnings.setScale(2, RoundingMode.DOWN);
}
Map<String, String> map = new HashMap<>();
@@ -2206,17 +2206,9 @@
map.put("usPositionEarnings", String.valueOf(usPositionEarnings)); //美股持仓收益
map.put("usPositionEarningsParent", usPositionEarningsParent + "%");//美股持仓收益率
- map.put("hkMarketValue", String.valueOf(hkMarketValue)); //港股市值
- map.put("hkPositionEarnings", String.valueOf(hkPositionEarnings)); //港股持仓收益
- map.put("hkPositionEarningsParent", hkPositionEarningsParent + "%");//港股持仓收益率
-
- map.put("inMarketValue", String.valueOf(inMarketValue)); //印股市值
- map.put("inPositionEarnings", String.valueOf(inPositionEarnings)); //印股持仓收益
- map.put("inPositionEarningsParent", inPositionEarningsParent + "%");//印股持仓收益率
-
- map.put("twMarketValue", String.valueOf(twMarketValue)); //台股市值
- map.put("twPositionEarnings", String.valueOf(twPositionEarnings)); //台股持仓收益
- map.put("twPositionEarningsParent", twPositionEarningsParent + "%");//台股持仓收益率
+ map.put("jpMarketValue", String.valueOf(jpMarketValue)); //日股市值
+ map.put("jpPositionEarnings", String.valueOf(jpPositionEarnings)); //日股持仓收益
+ map.put("jpPositionEarningsParent", jpPositionEarningsParent + "%");//日股持仓收益率
return ServerResponse.createBySuccess(map);
} catch (Exception e) {
--
Gitblit v1.9.3