From 846ff7c7570ef124b10e48d6816955a1bbc02db5 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 23 May 2024 01:33:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zyqs-0502' into zyqs-0502
---
src/main/java/com/nq/service/impl/UserPositionServiceImpl.java | 19 +++++--------------
1 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
index 81c7180..ba92dc0 100644
--- a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
@@ -149,7 +149,7 @@
}
//股票类型 现价 数据源的处理
- BigDecimal nowPrice = priceServices.getNowPrice(stock.getStockCode());
+ BigDecimal nowPrice = priceServices.getNowPrice(stock.getStockCode(),stock.getStockType());
if (nowPrice.compareTo(new BigDecimal("0")) == 0) {
return ServerResponse.createByErrorMsg("报价0，请稍后再试", request);
@@ -349,23 +349,14 @@
@Override
public ServerResponse allSell(HttpServletRequest request,String stockType) throws Exception{
//判断股票是否在可交易时间段
- User user = iUserService.getCurrentUser(request);
+ User user = iUserService.getCurrentUser(request);
QueryWrapper<UserPosition> queryWrapper = new QueryWrapper<>();
- if(stockType.equals(EStockType.US.getCode())){
- queryWrapper.eq("user_id",user.getId());
- queryWrapper.isNull("sell_order_id");
- queryWrapper.or().eq("stock_gid",EStockType.US.getCode());
-
- }else{
- queryWrapper.eq("user_id",user.getId());
- queryWrapper.eq("stock_gid",stockType);
- queryWrapper.isNull("sell_order_id");
- }
-
+ 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,request);
+ sell(userPositionList.get(i).getPositionSn(), 0);
}
return ServerResponse.createBySuccessMsg("平仓成功!");
}
--
Gitblit v1.9.3