1

zj

2026-06-03 d8d3b097d7c41b460df91d1285e32a38e5c1bbf5

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

@@ -11,6 +11,7 @@
import com.nq.pojo.*;
import com.nq.service.*;
import com.nq.utils.DateTimeUtil;
import com.nq.utils.KeyUtils;
import com.nq.utils.PropertiesUtil;
import com.nq.utils.SymmetricCryptoUtil;
import com.nq.utils.ip.IpUtils;
@@ -111,16 +112,16 @@

    public ServerResponse reg(String yzmCode, String agentCode, String phone, String userPwd, HttpServletRequest request) {
        if (StringUtils.isBlank(agentCode) || StringUtils.isBlank(phone) ||
                StringUtils.isBlank(userPwd) || StringUtils.isBlank(yzmCode))
                StringUtils.isBlank(userPwd))
        {
            return ServerResponse.createByErrorMsg("注册失败, 参数不能为空");
        }


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

        log.info("redis_yzm = {},yzmCode = {}", redis_yzm, yzmCode);
//        String keys = "AliyunSmsCode:" + 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("注册失败, 验证码错误");
//        }
@@ -153,10 +154,19 @@
        user.setIsActive(Integer.valueOf(0));

        user.setRegTime(new Date());
        String uip = IpUtils.getIp(request);
        user.setRegIp(uip);
        String uadd = JuheIpApi.ip2Add(uip);
        user.setRegAddress(uadd);
//        String uip = IpUtils.getIp(request);
//        user.setRegIp(uip);
//        // IP地址查询改为异步处理，避免阻塞注册接口
//        final String finalUip = uip;
//        final String finalPhone = phone;
//        new Thread(() -> {
//            try {
//                String uadd = JuheIpApi.ip2Add(finalUip);
//                log.info("用户注册IP地址查询完成 手机 {} , ip = {} 地址 = {}", finalPhone, finalUip, uadd);
//            } catch (Exception e) {
//                log.error("IP地址查询异常", e);
//            }
//        }).start();

        user.setIsLogin(Integer.valueOf(0));

@@ -178,12 +188,28 @@
        int insertCount = this.userMapper.insert(user);

        if (insertCount > 0) {
            log.info("用户注册成功 手机 {} , ip = {} 地址 = {}", new Object[] { phone, uip, uadd });
            //用户注册成功重新代理机构码重新生成
            String newAgentCode = generateUniqueAgentCode();
            agentUser.setAgentCode(newAgentCode);
            iAgentUserService.updateAgentCode(agentUser);
            log.info("用户注册成功 手机 {} , ip = {}", phone, "123123");
            return ServerResponse.createBySuccessMsg("注册成功.请登录");
        }
        return ServerResponse.createBySuccessMsg("注册出错, 请重试");
    }

    public String generateUniqueAgentCode() {
        // 生成新的 agent code
        String newAgentCode = KeyUtils.getAgentUniqueKey();

        // 如果找到重复的 agent code，则递归重新生成
        if (iAgentUserService.findByCode(newAgentCode) != null) {
            return generateUniqueAgentCode();  // 递归调用
        }

        // 返回唯一的 agent code
        return newAgentCode;
    }


    public ServerResponse login(String phone, String userPwd, HttpServletRequest request) {
@@ -212,6 +238,25 @@
        String property = PropertiesUtil.getProperty("user.cookie.name");
//        System.out.println(property);
        String loginToken = request.getHeader(property);
        
        // 如果header中没有token，尝试从cookie获取
        if (loginToken == null) {
            javax.servlet.http.Cookie[] cookies = request.getCookies();
            if (cookies != null) {
                for (javax.servlet.http.Cookie cookie : cookies) {
                    if (property != null && property.equals(cookie.getName())) {
                        loginToken = cookie.getValue();
                        break;
                    }
                }
            }
        }
        
        // 如果cookie中也没有token，尝试从URL参数获取（用于iframe等场景）
        if (loginToken == null) {
            loginToken = request.getParameter("token");
        }
        
        if (loginToken == null) {
            return null;
        }
@@ -265,18 +310,11 @@
                stock.setStockName(stockFutures.getFuturesName());
                stock.setIsLock(0);
            }
        } else if(code.contains("sh") || code.contains("sz")){
         return ServerResponse.createByErrorMsg("添加失败，指数不支持自选");
//            StockIndex stockIndex = this.stockIndexMapper.selectIndexByCode(stockcode);
//            if(stockIndex != null){
//                stock.setId(stockIndex.getId());
//                stock.setStockCode(stockIndex.getIndexCode());
//                stock.setStockGid(stockIndex.getIndexGid()+"zs");
//                stock.setStockName(stockIndex.getIndexName());
//                stock.setIsLock(0);
//            }
        } else {
            stock = this.stockMapper.findStockByCode(code);
            stock = this.stockMapper.findStockByCode(stockcode);
            if (stock == null && !code.equals(stockcode)) {
                stock = this.stockMapper.findStockByCode(code);
            }
        }
        if (stock == null) {
            return ServerResponse.createByErrorMsg("添加失败，股票不存在");
@@ -349,11 +387,32 @@
        String userJson = RedisShardedPoolUtils.get(loginToken);
        User user = (User)JsonUtil.string2Obj(userJson, User.class);
        User dbuser = this.userMapper.selectByPrimaryKey(user.getId());
        RedisShardedPoolUtils.setEx(loginToken, JsonUtil.obj2String(dbuser), 9999);
        UserInfoVO userInfoVO = assembleUserInfoVO(dbuser);

        return ServerResponse.createBySuccess(userInfoVO);
    }

    @Override
    public void syncUserCache(HttpServletRequest request) {
        if (request == null) {
            return;
        }
        String cookieName = PropertiesUtil.getProperty("user.cookie.name");
        String loginToken = request.getHeader(cookieName);
        if (StringUtils.isBlank(loginToken)) {
            return;
        }
        String userJson = RedisShardedPoolUtils.get(loginToken);
        User cached = (User) JsonUtil.string2Obj(userJson, User.class);
        if (cached == null || cached.getId() == null) {
            return;
        }
        User dbUser = this.userMapper.selectByPrimaryKey(cached.getId());
        if (dbUser != null) {
            RedisShardedPoolUtils.setEx(loginToken, JsonUtil.obj2String(dbUser), 9999);
        }
    }

    public ServerResponse updatePwd(String oldPwd, String newPwd, HttpServletRequest request) {
        if (StringUtils.isBlank(oldPwd) || StringUtils.isBlank(newPwd)) {
@@ -444,6 +503,16 @@
            }
            return ServerResponse.createByErrorMsg("修改失败");
        }

    @Override
    public void updateSignedContract(Integer userId, String signedContract) {
        this.userMapper.updateSignedContract(userId,signedContract);
    }
    @Override
    public void updateSignedAgreement(Integer userId, String signedAgreement) {
        this.userMapper.updateSignedAgreement(userId,signedAgreement);
    }


    @Transactional
    @Override
@@ -545,8 +614,8 @@
    }


    public ServerResponse auth(String realName, String idCard, String img1key, String img2key, String img3key, HttpServletRequest request) {
        if (StringUtils.isBlank(realName) || StringUtils.isBlank(idCard)){
    public ServerResponse auth(String realName, String idCard, String address, String img1key, String img2key, String img3key, HttpServletRequest request) {
        if (StringUtils.isBlank(realName) || StringUtils.isBlank(idCard) || StringUtils.isBlank(address)){
//                StringUtils.isBlank(img1key) ||
//                StringUtils.isBlank(img2key))
            return ServerResponse.createByErrorMsg("参数不能为空");
@@ -565,6 +634,7 @@
        user.setNickName(realName);
        user.setRealName(realName);
        user.setIdCard(idCard);
        user.setRegAddress(address);

        user.setImg1Key(img1key);
        user.setImg2Key(img2key);
@@ -1817,18 +1887,30 @@
        BigDecimal allProfitAndLose = positionVO.getAllProfitAndLose();
        userInfoVO.setAllProfitAndLose(allProfitAndLose);

//        BigDecimal userAllAmt = user.getUserAmt();
        BigDecimal userAllAmt = user.getEnableAmt();
        userAllAmt = userAllAmt.add(allProfitAndLose);

        // 账户总资产 = 两融可用 + 冻结保证金 + 浮动盈亏
        // 浮动盈亏里已扣过买入手续费，而买入手续费下单时已从 enableAmt 扣除，此处加回 openBuyFees 避免总资产「少扣手续费」
        BigDecimal allFreezAmt = positionVO.getAllFreezAmt() == null ? BigDecimal.ZERO : positionVO.getAllFreezAmt();
        BigDecimal enableAmt = user.getEnableAmt() == null ? BigDecimal.ZERO : user.getEnableAmt();
        BigDecimal openBuyFees = BigDecimal.ZERO;
        List<UserPosition> openPositions = this.iUserPositionService.findPositionByUserIdAndSellIdIsNull(user.getId());
        if (openPositions != null) {
            for (UserPosition position : openPositions) {
                if (position.getOrderFee() != null) {
                    openBuyFees = openBuyFees.add(position.getOrderFee());
                }
            }
        }
        BigDecimal userAllAmt = enableAmt.add(allFreezAmt).add(allProfitAndLose).add(openBuyFees);

        userInfoVO.setEnableIndexAmt(user.getEnableIndexAmt());
        userInfoVO.setEnaleWithdrawAmt(user.getEnaleWithdrawAmt());
        userInfoVO.setIsSignedContract(user.getIsSignedContract());
        userInfoVO.setIsSignedAgreement(user.getIsSignedAgreement());
        userInfoVO.setHkAmt(user.getHkAmt());

        BigDecimal historyProfitLoss = new BigDecimal(0);
        BigDecimal buyAmtAutual = new BigDecimal(0);
        List<UserPosition> userPositionscc = this.userPositionMapper.findMyPositionByCodeAndSpell(user.getId(), "", "", 0);
        List<UserPosition> userPositionscc = this.userPositionMapper.findMyPositionByCodeAndSpell(user.getId(), "", "", 1);

        if (userPositionscc.size() > 0) {
            for (UserPosition position : userPositionscc) {
@@ -1838,10 +1920,9 @@
            }
        }
        userInfoVO.setBuyAmtAutual(buyAmtAutual);
        userAllAmt = userAllAmt.add(buyAmtAutual);
        userInfoVO.setUserAmt(userAllAmt);
        userInfoVO.setUserAmt(userAllAmt.setScale(2, RoundingMode.HALF_UP));

        List<UserPosition> userPositions = this.userPositionMapper.findMyPositionByCodeAndSpell(user.getId(), "", "", 1);
        List<UserPosition> userPositions = this.userPositionMapper.findMyPositionByCodeAndSpell(user.getId(), "", "", 2);

        if (userPositions.size() > 0) {
            for (UserPosition position : userPositions) {