1

zj

2025-09-16 bb6fe349b56f454f9ec6f01c32f652ecd416f151

 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;
@@ -16,6 +17,7 @@
import com.nq.pojo.reponse.RUserAssets;
import com.nq.service.*;
import com.nq.utils.UserPointUtil;
import com.nq.utils.email.EmailValidator;
import com.nq.utils.redis.RedisKeyUtil;
import com.nq.utils.timeutil.DateTimeUtil;
import com.nq.utils.PropertiesUtil;
@@ -40,6 +42,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;
@@ -145,16 +148,17 @@
                StringUtils.isBlank(userPwd) || StringUtils.isBlank(yzmCode)) {
            return ServerResponse.createByErrorMsg("注册失败。该参数不能为空",request);
        }
        if(!EmailValidator.isValidEmail(phone)){
            return ServerResponse.createByErrorMsg("请输入正确的邮箱格式",request);
        }


        String keys = "AliyunSmsCode:" + phone;
        String keys = "emailCode:" + phone;
        String redis_yzm = RedisShardedPoolUtils.get(keys);

        log.info("redis_yzm = {},yzmCode = {}", redis_yzm, yzmCode);
        if (!yzmCode.equals(redis_yzm) && !"6666".equals(yzmCode)) {
            return ServerResponse.createByErrorMsg("由于验证码不正确，注册失败。过程",request);
            return ServerResponse.createByErrorMsg("验证码不正确或已过期！，注册失败",request);
        }


        AgentUser agentUser = this.iAgentUserService.findByCode(agentCode);
        if (agentUser == null) {
@@ -202,7 +206,7 @@

    public ServerResponse login(String phone, String userPwd, HttpServletRequest request) {
        if (StringUtils.isBlank(phone) || StringUtils.isBlank(userPwd)) {
            return ServerResponse.createByErrorMsg("手机号码和密码不能为空",request);
            return ServerResponse.createByErrorMsg("账号和密码不能为空",request);
        }
        userPwd = SymmetricCryptoUtil.encryptPassword(userPwd);
        User user = this.userMapper.login(phone, userPwd);
@@ -1188,5 +1192,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);
    }
}