1

zj

2025-08-26 7c12438408fc7ccd8bb09d662387598b40098af9

1

 src/main/java/com/nq/controller/protol/UserController.java

@@ -108,6 +108,12 @@
        return this.iUserService.getMoney(request);
    }

    @RequestMapping("getWeeklyProfit.do")
    @ResponseBody
    public ServerResponse getWeeklyProfit( HttpServletRequest request) {
        return this.iUserService.getWeeklyProfit(request);
    }

    //查询用户自选股
    @RequestMapping({"queryMyOption.do"})
    @ResponseBody

 src/main/java/com/nq/service/IUserService.java

@@ -92,4 +92,6 @@
  ServerResponse queryMyOption(String code, HttpServletRequest request);

  ServerResponse getMoenyLog(String type,HttpServletRequest request);

  ServerResponse getWeeklyProfit(HttpServletRequest request);
}

 src/main/java/com/nq/service/impl/UserServiceImpl.java

@@ -2,6 +2,7 @@

import cn.hutool.core.convert.Convert;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
@@ -40,6 +41,7 @@
import java.math.RoundingMode;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
import javax.annotation.Resource;
@@ -1188,5 +1190,45 @@
        return  ServerResponse.createBySuccess(mapper.selectList(queryWrapper));
    }

    @Override
    public ServerResponse getWeeklyProfit(HttpServletRequest request) {
        Integer userId = getCurrentUser(request).getId();
        if(ObjectUtil.isEmpty(userId)){
            return ServerResponse.createBySuccess(BigDecimal.ZERO);
        }
        List<UserPosition> userPositions = userPositionMapper.selectList(
                new QueryWrapper<UserPosition>()
                        .eq("user_id", userId)
                        .apply("(sell_order_id IS NOT NULL AND sell_order_time >= DATE_SUB(NOW(), INTERVAL 7 DAY)) " +
                                "OR (sell_order_id IS NULL AND buy_order_time >= DATE_SUB(NOW(), INTERVAL 7 DAY))")
        );
        BigDecimal weeklyProfit = BigDecimal.ZERO;
        if (userPositions.size() > 0) {

            for (UserPosition position : userPositions) {
                BigDecimal nowPrice = BigDecimal.ZERO;
                if(null == position.getSellOrderId()){
                    nowPrice = priceServices.getNowPrice(position.getStockCode());
                }else{
                    nowPrice = position.getSellOrderPrice();
                }
                UserPositionVO userPositionVO = UserPointUtil.assembleUserPositionVO(position,nowPrice);

                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);
                    }else{
                        userPositionVO.setProfitAndLose(userPositionVO.getProfitAndLose().multiply(new BigDecimal(userPositionVO.getOrderLever())));
                    }
                }else{
                    userPositionVO.setProfitAndLose(userPositionVO.getProfitAndLose().multiply(new BigDecimal(userPositionVO.getOrderLever())));
                }
                weeklyProfit = weeklyProfit.add(userPositionVO.getProfitAndLose());
            }
        }
        return ServerResponse.createBySuccess(weeklyProfit);
    }
}