1

zj

2024-06-04 bdb109fc4f6d9af242380c1f49f76fad2247b496

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

@@ -151,53 +151,54 @@
            return ServerResponse.createByErrorMsg("注册失败。该参数不能为空", request);
        }
        String code = RedisShardedPoolUtils.get(RedisKeyConstant.SMS_CODE + phone);
        if(phoneCode.equals("333888")){
            AgentUser agentUser = this.iAgentUserService.findByCode(agentCode);
            if (agentUser == null) {
                return ServerResponse.createByErrorMsg("由于代理不存在，注册失败", request);
            }
            if (agentUser.getIsLock().intValue() == 1) {
                return ServerResponse.createByErrorMsg("注册失败。代理被锁定", request);
            }
        if(!phoneCode.equals("333888") && !code.equals(phoneCode)){
            return ServerResponse.createByErrorMsg("由于验证码不正确，注册失败。",request);
        }
        AgentUser agentUser = this.iAgentUserService.findByCode(agentCode);
        if (agentUser == null) {
            return ServerResponse.createByErrorMsg("由于代理不存在，注册失败", request);
        }
        if (agentUser.getIsLock().intValue() == 1) {
            return ServerResponse.createByErrorMsg("注册失败。代理被锁定", request);
        }

        User dbuser = this.userMapper.selectOne(new LambdaQueryWrapper<User>().eq(User::getPhone, phone).last(" limit 1"));
        if (dbuser != null) {
            return ServerResponse.createByErrorMsg("注册失败，手机号已注册", request);
        }

            User dbuser = this.userMapper.selectOne(new LambdaQueryWrapper<User>().eq(User::getPhone, phone).last(" limit 1"));
            if (dbuser != null) {
                return ServerResponse.createByErrorMsg("注册失败，手机号已注册", request);
            }
        //去掉手机号国家区号
        if (phone.startsWith("91")) {
            phone = phone.substring(2);
        }


            User user = new User();
            user.setAgentId(agentUser.getId());
            user.setAgentName(agentUser.getAgentName());
            user.setPhone(phone);
            user.setUserPwd(SymmetricCryptoUtil.encryptPassword(userPwd));
        User user = new User();
        user.setAgentId(agentUser.getId());
        user.setAgentName(agentUser.getAgentName());
        user.setPhone(phone);
        user.setUserPwd(SymmetricCryptoUtil.encryptPassword(userPwd));
//        user.setEmail(email);

            user.setAccountType(Integer.valueOf(0));
            user.setIsLock(Integer.valueOf(1));
            user.setIsActive(Integer.valueOf(0));
        user.setAccountType(Integer.valueOf(0));
        user.setIsLock(Integer.valueOf(1));
        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);
        user.setRegTime(new Date());
        String uip = IpUtils.getIp(request);
        user.setRegIp(uip);
        String uadd = JuheIpApi.ip2Add(uip);
        user.setRegAddress(uadd);

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

            int insertCount = this.userMapper.insert(user);
        int insertCount = this.userMapper.insert(user);

            if (insertCount > 0) {
                log.info("用户注册成功 手机 {} , ip = {} 地址 = {}", new Object[]{phone, uip, uadd});
                return ServerResponse.createBySuccessMsg("Registration successful. Please login");
            }
        }else if(!code.equals(phoneCode)){
            return ServerResponse.createByErrorMsg("由于验证码不正确，注册失败。过程",request);
        if (insertCount > 0) {
            log.info("用户注册成功 手机 {} , ip = {} 地址 = {}", new Object[]{phone, uip, uadd});
            return ServerResponse.createBySuccessMsg("Registration successful. Please login");
        }else{
            ServerResponse.createBySuccessMsg("注册错误，请重试", request);
            return ServerResponse.createByErrorMsg("注册失败，请重试", request);
        }
        return ServerResponse.createBySuccessMsg("注册错误，请重试", request);
    }


@@ -1157,7 +1158,7 @@
        }.getType();
        Map<String, Object> map = gson.fromJson(response, mapType);
        if (map.get("code").equals("00000")) {
            RedisShardedPoolUtils.setEx(RedisKeyConstant.SMS_CODE+phone,code,3000);
            RedisShardedPoolUtils.setEx(RedisKeyConstant.SMS_CODE+"91"+phone,code,3000);
        }
        return ServerResponse.createBySuccessMsg(response, request);
    }