Merge remote-tracking branch 'origin/master'

phpcjl

2024-12-06 9641ecf8686475aa13d8520ccdde4611b5457541

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java

@@ -192,18 +192,17 @@
//         return R.fail("验证码错误");
//      }
      //使用jscode获取微信openid
//      Map<String, Object> map = weChatUtil.code2Session(registerAccount.getJscode());
//      Integer errcode = Integer.valueOf(map.get("errcode").toString());
//      if(0 != errcode){
//         return R.fail(map.get("msg").toString());
//      }
//      String openid = map.get("openid").toString();
//      //查询用户是否注册
//      AppUser appUser = this.getOne(new LambdaQueryWrapper<AppUser>().eq(AppUser::getWxOpenid, openid).ne(AppUser::getStatus, 3).eq(AppUser::getDelFlag, 0));
//      if(null != appUser){
//         return R.fail("此微信号已注册，请直接登录！");
//      }
      AppUser appUser = null;
      Map<String, Object> map = weChatUtil.code2Session(registerAccount.getJscode());
      Integer errcode = Integer.valueOf(map.get("errcode").toString());
      if(0 != errcode){
         return R.fail(map.get("msg").toString());
      }
      String openid = map.get("openid").toString();
      //查询用户是否注册
      AppUser appUser = this.getOne(new LambdaQueryWrapper<AppUser>().eq(AppUser::getWxOpenid, openid).ne(AppUser::getStatus, 3).eq(AppUser::getDelFlag, 0));
      if(null != appUser){
         return R.fail("此微信号已注册，请直接登录！");
      }
      AppUser appUser1 = this.getOne(new LambdaQueryWrapper<AppUser>().eq(AppUser::getPhone, registerAccount.getPhone()).ne(AppUser::getStatus, 3).eq(AppUser::getDelFlag, 0));
      if(null != appUser1){
         return R.fail("手机号已注册，请直接登录！");
@@ -212,7 +211,7 @@
         appUser = new AppUser();
         appUser.setName(registerAccount.getName());
         appUser.setPhone(registerAccount.getPhone());
//         appUser.setWxOpenid(openid);
         appUser.setWxOpenid(openid);
         //注册默认为普通会员
         appUser.setVipId(1);
         appUser.setStatus(1);