From 940dd1b292db4c5cc2df2f137fa46c37f2159898 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 05 十二月 2024 18:06:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
index da54600..1a219fb 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
@@ -10,7 +10,6 @@
import com.ruoyi.account.util.weChat.WeChatUtil;
import com.ruoyi.account.vo.*;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.other.api.domain.Shop;
@@ -18,7 +17,6 @@
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.model.LoginUser;
-import org.checkerframework.checker.units.qual.A;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -194,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("手机号已注册，请直接登录！");
@@ -214,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);
--
Gitblit v1.7.1