From 68b9175323a2f9b40ffcc48bb01af1d8279e5d01 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Fri, 22 Aug 2025 10:21:51 +0800
Subject: [PATCH] 平仓返回保证金修改
---
src/main/java/com/nq/service/impl/StockOptionServiceImpl.java | 35 ++++++++++++++++-------------------
1 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/StockOptionServiceImpl.java b/src/main/java/com/nq/service/impl/StockOptionServiceImpl.java
index bb235a7..5f06476 100644
--- a/src/main/java/com/nq/service/impl/StockOptionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockOptionServiceImpl.java
@@ -4,7 +4,6 @@
import com.github.pagehelper.PageInfo;
-import com.google.common.collect.Lists;
import com.nq.common.ServerResponse;
@@ -18,18 +17,16 @@
import com.nq.pojo.User;
+import com.nq.pojo.reponse.RPageInfo;
import com.nq.service.IStockOptionService;
import com.nq.service.IUserService;
-import com.nq.utils.redis.RedisShardedPoolUtils;
import com.nq.utils.stock.sina.StockApi;
import com.nq.vo.stock.StockListVO;
-import com.nq.vo.stock.StockOptionListVO;
-import com.nq.vo.stock.StockVO;
-
+import java.util.ArrayList;
import java.util.List;
import javax.annotation.Resource;
@@ -59,24 +56,22 @@
@Autowired
StockMapper stockMapper;
- public ServerResponse<PageInfo> findMyStockOptions(String keyWords, HttpServletRequest request, int pageNum, int pageSize,String stockType) {
+ public ServerResponse<PageInfo> findMyStockOptions(String keyWords, HttpServletRequest request, int pageNum, int pageSize, String stockType) {
PageHelper.startPage(pageNum, pageSize);
User user = this.iUserService.getCurrentUser(request);
- PageInfo pageInfo;
- if (user == null) {
- pageInfo =new PageInfo();
- return ServerResponse.createBySuccessMsg("請先登錄");
- }else{
- List<StockOption> stockOptions = this.stockOptionMapper.findMyOptionByKeywords(user.getId(), keyWords,stockType);
- List<StockListVO> stockOptionListVOS = Lists.newArrayList();
- for (StockOption option : stockOptions) {
- StockListVO stockListVO = assembleStockOptionListVO(option);
- stockOptionListVOS.add(stockListVO);
- }
- pageInfo = new PageInfo(stockOptions);
- pageInfo.setList(stockOptionListVOS);
+ RPageInfo pageInfo;
+
+ List<StockOption> stockOptions = this.stockOptionMapper.findMyOptionByKeywords(user.getId(), keyWords, stockType);
+ List<StockListVO> stockOptionListVOS = new ArrayList<>();
+
+ for (StockOption option : stockOptions) {
+ StockListVO stockListVO = assembleStockOptionListVO(option);
+ stockOptionListVOS.add(stockListVO);
}
+ pageInfo = new RPageInfo();
+ pageInfo.setList(stockOptionListVOS);
+ pageInfo.setStockType(stockType);
return ServerResponse.createBySuccess(pageInfo);
}
@@ -88,6 +83,7 @@
}
return ServerResponse.createByErrorMsg("已添加");
}
+
public String isMyOption(Integer uid, String code) {
StockOption stockOption = this.stockOptionMapper.isOption(uid, code);
if (stockOption == null) {
@@ -95,6 +91,7 @@
}
return "1";
}
+
private StockListVO assembleStockOptionListVO(StockOption option) {
Stock stock = this.stockMapper.selectByPrimaryKey(option.getStockId());
StockListVO stockVO = StockApi.getStockRealTime(stock);
--
Gitblit v1.9.3