From c6ebbc7a11ca228addb0cca7c5f34d2d5ae3249b Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 18 六月 2025 17:48:11 +0800
Subject: [PATCH] 更新优化
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java
index 4a16eb7..e6854aa 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java
@@ -98,9 +98,15 @@
tbUser.setPhone(loginBody.getPhone());
tbUser.setStatus(1);
tbUser.setUserName(loginBody.getPhone());
- tbUser.setInviteId(loginBody.getInviteId());
+ tbUser.setInviteId(loginBody.getInviteUserId());
tbUserService.save(tbUser);
user = tbUser;
+ ajax.put("firstRegister",1);
+ }else {
+ ajax.put("firstRegister",0);
+ if(StringUtils.isEmpty(user.getInviteId()) && !StringUtils.isEmpty(loginBody.getInviteUserId())){
+ user.setInviteId(loginBody.getInviteUserId());
+ }
}
LoginUser loginUser = new LoginUser();
loginUser.setUserId(Long.valueOf(user.getId()));
@@ -111,10 +117,11 @@
return ajax;
}
- @ApiOperation(value = "通过code获得openid,获取用户信息",tags = {"登录模块"})
+ @ApiOperation(value = "微信登录 通过code获得openid,获取用户信息",tags = {"登录模块"})
@PostMapping("/openIdByJsCode")
public AjaxResult openIdByJsCode(@RequestBody AppletUserEncrypteData data) {
log.info("<<<<<<<<换取openid开始<<<<<<<<:{}", data.getCode());
+ AjaxResult ajax = AjaxResult.success();
WxAppletTools appletTools = new WxAppletTools(wxRestTemplate, wxConfig, redisService);
Code2SessionRespBody body = appletTools.getOpenIdByJscode2session(new Code2SessionResqBody().build(data.getCode()));
String openid = body.getOpenid();
@@ -135,20 +142,26 @@
user.setInviteId(data.getInviteUserId());
user.setStatus(1);
tbUserService.save(user);
+ ajax.put("firstRegister",1);
}else {
+ ajax.put("firstRegister",0);
+ if(StringUtils.isEmpty(user.getInviteId()) && !StringUtils.isEmpty(data.getInviteUserId())){
+ user.setInviteId(data.getInviteUserId());
+ }
user.setOpenId(appletUserDecodeData.getOpenId());
user.updateById();
}
if(user.getStatus()==2){
return AjaxResult.error("登录失败，当前账号已被冻结");
}
- AjaxResult ajax = AjaxResult.success();
+
LoginUser loginUser = new LoginUser();
loginUser.setUserId(Long.valueOf(user.getId()));
loginUser.setUser(new SysUser());
ajax.put(Constants.TOKEN, tokenService.createToken(loginUser));
ajax.put("username",user.getUserName());
ajax.put("avatar",user.getAvatar());
+
return ajax;
}
--
Gitblit v1.7.1