luodangjia
2025-01-24 047e974de3509cbfa8a8f6558c970d3b2492972c
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
@@ -282,6 +282,12 @@
      if(null != appUser1 && appUser1.getStatus() == 2){
         return R.fail("手机号已注册,请直接登录!");
      }
      String avatar = registerAccount.getAvatar();
      if (StringUtils.isEmpty(avatar)){
         avatar = "http://qijishenghuiyuan.obs.cn-southwest-2.myhuaweicloud.com/admin/aedfbbb41280471f8d9fa7905298b65f.png";
      }
      //如果手机号已注册,但是没有微信号,则将微信号添加到已有账户上
      if(null != appUser1 && StringUtils.isEmpty(appUser1.getWxOpenid())){
         appUser1.setWxOpenid(openid);
@@ -289,7 +295,7 @@
         appUser = appUser1;
      }else if(null == appUser){
         appUser = new AppUser();
         appUser.setAvatar(registerAccount.getAvatar());
         appUser.setAvatar(avatar);
         appUser.setName(registerAccount.getName());
         appUser.setPhone(registerAccount.getPhone());
         appUser.setWxOpenid(openid);
@@ -881,7 +887,7 @@
      Set<Long> replaceable = redisTemplate.opsForZSet().rangeByScore("replaceable", 0, LocalDateTime.now().toEpochSecond(ZoneOffset.UTC));
      if(replaceable.size() > 0){
         List<AppUser> list = this.list(new LambdaQueryWrapper<AppUser>().eq(AppUser::getDelFlag, 0).eq(AppUser::getChangePromoter, 0)
               .eq(AppUser::getStatus, 1).in(AppUser::getId, unbind_promoter));
               .eq(AppUser::getStatus, 1).in(AppUser::getId, replaceable));
         for (AppUser appUser : list) {
            appUser.setChangePromoter(1);
            this.updateById(appUser);