From f2a57f2a9fa309f872d10c7fada992b63a0c0d5f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期日, 27 十月 2024 20:52:48 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserServiceImpl.java | 44 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserServiceImpl.java
index a464df6..bd17572 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserServiceImpl.java
@@ -11,6 +11,7 @@
import com.ruoyi.account.mapper.TAppUserMapper;
import com.ruoyi.account.service.TAppUserService;
import com.ruoyi.account.service.TInviteUserService;
+import com.ruoyi.account.util.RptUtils;
import com.ruoyi.account.wx.model.WeixinProperties;
import com.ruoyi.account.wx.pojo.AppletUserDecodeData;
import com.ruoyi.common.core.exception.ServiceException;
@@ -18,6 +19,7 @@
import com.ruoyi.system.api.model.LoginUserApplet;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
import org.springframework.web.client.RestTemplate;
import java.util.HashMap;
@@ -54,19 +56,31 @@
if(Objects.isNull(appUser)){
appUser = new TAppUser();
appUser.setPhone(appletUserDecodeData.getPhoneNumber());
+ appUser.setInviteUserId(inviteUserId);
}
}
if(Objects.nonNull(appUser.getStatus())){
- throwInfo(appUser.getStatus());
+ switch (appUser.getStatus()){
+ case 1:
+ break;
+ case 2:
+ throw new ServiceException("账号被冻结,请联系管理员");
+ case 3:
+ appUser = new TAppUser();
+ appUser.setPhone(appletUserDecodeData.getPhoneNumber());
+ break;
+ }
}
- appUser.setInviteUserId(inviteUserId);
- appUser.setAvatar(appletUserDecodeData.getAvatarUrl());
+
+ appUser.setAvatar(StringUtils.hasLength(appletUserDecodeData.getAvatarUrl())?appletUserDecodeData.getAvatarUrl():"http://221.182.45.100:8090/2024-10-26/logo.png");
+ appUser.setName(StringUtils.hasLength(appletUserDecodeData.getNickName())?appletUserDecodeData.getNickName():RptUtils.around(appletUserDecodeData.getPhoneNumber(),3,4));
appUser.setCity(appletUserDecodeData.getCity());
- appUser.setName(appletUserDecodeData.getNickName());
appUser.setProvince(appletUserDecodeData.getProvince());
appUser.setWxOpenid(appletUserDecodeData.getOpenId());
this.saveOrUpdate(appUser);
- inviteUserService.saveInviteUser(appUser.getId(), inviteUserId);
+ if(Objects.nonNull(inviteUserId)){
+ inviteUserService.saveInviteUser(appUser.getId(), inviteUserId);
+ }
return this.getUserInfo(appUser);
}
@@ -86,15 +100,28 @@
if(Objects.isNull(appUser)){
appUser = new TAppUser();
appUser.setPhone(phone);
+ appUser.setInviteUserId(inviteUserId);
}
}
if(Objects.nonNull(appUser.getStatus())){
- throwInfo(appUser.getStatus());
+ switch (appUser.getStatus()){
+ case 1:
+ break;
+ case 2:
+ throw new ServiceException("账号被冻结,请联系管理员");
+ case 3:
+ appUser = new TAppUser();
+ appUser.setPhone(phone);
+ break;
+ }
}
- appUser.setInviteUserId(inviteUserId);
appUser.setAliOpenid(response.getOpenId());
+ appUser.setAvatar("http://221.182.45.100:8090/2024-10-26/logo.png");
+ appUser.setName(RptUtils.around(phone,3,4));
this.saveOrUpdate(appUser);
- inviteUserService.saveInviteUser(appUser.getId(), inviteUserId);
+ if(Objects.nonNull(inviteUserId)){
+ inviteUserService.saveInviteUser(appUser.getId(), inviteUserId);
+ }
return this.getUserInfo(appUser);
}
// @Override
@@ -132,6 +159,7 @@
LoginUserApplet loginUserApplet = new LoginUserApplet();
if(ObjectUtils.isNotNull(appUser)){
loginUserApplet.setUserId(appUser.getId());
+ loginUserApplet.setUserIdStr(appUser.getId().toString());
loginUserApplet.setName(appUser.getName());
loginUserApplet.setPhone(appUser.getPhone());
loginUserApplet.setAvatar(appUser.getAvatar());
--
Gitblit v1.7.1