From 96e443a77b1d425d3e536c288fc271fe182f1496 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Fri, 18 Jul 2025 18:31:44 +0800
Subject: [PATCH] app股票列表修改
---
src/main/java/com/nq/service/impl/UserPositionServiceImpl.java | 76 ++++++++++++++++++++++++++++++++++---
1 files changed, 69 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
index 1be8727..11d666d 100644
--- a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
@@ -690,6 +690,68 @@
return ServerResponse.createBySuccess(pageInfo);
}
+ public ServerResponse findMyPositionByParam(String stockCode, String stockSpell,
+ Integer state, HttpServletRequest request,
+ int pageNum, int pageSize, String stockType, Integer positionType) {
+ try {
+ User user = iUserService.getCurrentUser(request);
+ if (user == null ){
+ return ServerResponse.createByErrorCodeMsg(ResponseCode.NEED_LOGIN.getCode(),"请先登录", request);
+ }
+
+ PageHelper.startPage(pageNum, pageSize);
+ List<UserPositionVO> userPositions = userPositionMapper.findMyPositionByParam(user.getId(),
+ stockCode, stockSpell, state, stockType, positionType);
+ PageInfo<UserPositionVO> pageInfo = new PageInfo<>(userPositions);
+
+ List<UserPositionVO> resultUserPositions = new ArrayList<>();
+ if (!pageInfo.getList().isEmpty()) {
+ for (UserPositionVO position : userPositions) {
+ UserPositionVO userPositionVO = position;
+ if (position.getPositionType() != 4) {
+ BigDecimal nowPrice;
+ if(state == 0){
+ nowPrice = priceServices.getNowPrice(position.getStockCode());
+ }else{
+ nowPrice = position.getSellOrderPrice();
+ }
+
+ userPositionVO = UserPointUtil.assembleUserPositionVO2(position,nowPrice);
+ userPositionVO.setOrderTotalPrice(userPositionVO.getOrderTotalPrice().multiply(new BigDecimal(userPositionVO.getOrderLever())));
+
+ StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new LambdaQueryWrapper<StockSubscribe>()
+ .eq(StockSubscribe::getCode, userPositionVO.getStockCode()));
+ if(position.getSellOrderId() == null){
+ if (null != stockSubscribe && DateUtil.date().before(stockSubscribe.getListDate())) {
+ userPositionVO.setProfitAndLose(BigDecimal.ZERO);
+ userPositionVO.setProfitAndLoseParent("0%");
+ userPositionVO.setIsListed(false);
+ }else{
+ userPositionVO.setIsListed(true);
+ userPositionVO.setProfitAndLose(userPositionVO.getProfitAndLose().multiply(new BigDecimal(userPositionVO.getOrderLever())));
+ }
+ }else{
+ userPositionVO.setProfitAndLose(userPositionVO.getProfitAndLose().multiply(new BigDecimal(userPositionVO.getOrderLever())));
+ }
+ } else {
+ //ai交易 计算收益率 收益/本金*100
+ BigDecimal profitAndLose = userPositionVO.getProfitAndLose()
+ .divide(userPositionVO.getOrderTotalPrice())
+ .multiply(new BigDecimal(100))
+ .setScale(2, BigDecimal.ROUND_DOWN);
+ userPositionVO.setProfitAndLoseParent(profitAndLose + "%");
+ }
+ resultUserPositions.add(userPositionVO);
+ }
+ }
+ pageInfo.setList(resultUserPositions);
+ return ServerResponse.createBySuccess(pageInfo);
+ } catch (Exception e) {
+ log.error("IUserPositionService findMyPositionByParam {}", e.getMessage());
+ }
+ return ServerResponse.createByError();
+ }
+
public PositionVO findUserPositionAllProfitAndLose(Integer userId) {
List<UserPosition> userPositions = this.userPositionMapper.findPositionByUserIdAndSellIdIsNull(userId);
@@ -958,7 +1020,7 @@
userPosition.setAgentId(user.getAgentId());
userPosition.setStockCode(stock.getStockCode());
userPosition.setStockName(stock.getStockName());
- userPosition.setStockGid(stock.getStockGid());
+ userPosition.setStockGid(stock.getStockType());
userPosition.setStockSpell(stock.getStockSpell());
userPosition.setBuyOrderId(GeneratePosition.getPositionId());
userPosition.setBuyOrderTime(DateTimeUtil.strToDate(buyTime));
@@ -1341,7 +1403,7 @@
stockType = stock.getStockType();
}
- userPosition.setPositionType(1);
+ userPosition.setPositionType(2);
userPosition.setPositionSn(KeyUtils.getUniqueKey());
userPosition.setUserId(userStockSubscribe.getUserId());
userPosition.setNickName(userStockSubscribe.getRealName());
@@ -1599,7 +1661,7 @@
userPosition.setAgentId(user.getAgentId());
userPosition.setStockCode(stock.getStockCode());
userPosition.setStockName(stock.getStockName());
- userPosition.setStockGid(stock.getStockGid());
+ userPosition.setStockGid(stock.getStockType());
userPosition.setStockSpell(stock.getStockSpell());
userPosition.setBuyOrderId(GeneratePosition.getPositionId());
userPosition.setBuyOrderTime(new Date());
@@ -2042,14 +2104,14 @@
BigDecimal usPositionEarningsParent = BigDecimal.ZERO; //美股持仓收益百分比
BigDecimal mxPositionEarningsParent = BigDecimal.ZERO; //墨西哥持仓收益百分比
- if (userPositions.size() > 0) {
+ if (!userPositions.isEmpty()) {
for (UserPosition position : userPositions) {
- BigDecimal nowPrice;
- if(state == 0){
+ 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())));
--
Gitblit v1.9.3