From ffbca1f7268fdaef327168ec55d32deb16c98e6c Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 17 Oct 2024 14:36:07 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/UserPositionServiceImpl.java |    2 +-
 src/main/java/com/nq/service/impl/UserServiceImpl.java         |    9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
index 154a843..0de5a18 100644
--- a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
@@ -331,7 +331,7 @@
     @Transactional
     public ServerResponse sell(String positionSn, int doType, Integer number,HttpServletRequest request) {
         UserPosition userPosition = this.userPositionMapper.findPositionBySn(positionSn);
-        if(number <= 0 || number > userPosition.getOrderNum()){
+        if(null == number || number <= 0 || number > userPosition.getOrderNum()){
             return ServerResponse.createByErrorMsg("请输入正确的平仓数", request);
         }
         // 手续费率
diff --git a/src/main/java/com/nq/service/impl/UserServiceImpl.java b/src/main/java/com/nq/service/impl/UserServiceImpl.java
index 7f50251..845d3f8 100644
--- a/src/main/java/com/nq/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserServiceImpl.java
@@ -617,14 +617,7 @@
         List<UserPositionVO> userPositionVOS = Lists.newArrayList();
         if (userPositions.size() > 0) {
             for (UserPosition position : userPositions) {
-                Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("stock_code",position.getStockCode()));
-                BigDecimal nowPrice = BigDecimal.ZERO;
-                if(null != stock){
-                    StockRealTimeBean stockRealTimeBean =  RedisKeyUtil.getCacheRealTimeStock(stock);
-                    nowPrice = new BigDecimal(stockRealTimeBean.getLast());
-                }
-                UserPositionVO userPositionVO = UserPointUtil.assembleUserPositionVO(position,nowPrice);
-
+                UserPositionVO userPositionVO = UserPointUtil.assembleUserPositionVO(position,priceServices.getNowPrice(position.getStockCode()));
                 StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new LambdaQueryWrapper<StockSubscribe>()
                         .eq(StockSubscribe::getCode, userPositionVO.getStockCode()));
                 if(position.getSellOrderId() == null){

--
Gitblit v1.9.3