From b0c4f3c46059d0c6310ec208b40114abceacff90 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期二, 10 十二月 2024 17:19:18 +0800
Subject: [PATCH] 1.
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java | 61 +++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 6 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 1a219fb..0da8644 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
@@ -1,18 +1,24 @@
package com.ruoyi.account.service.impl;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.account.api.model.AppUserShop;
import com.ruoyi.account.mapper.AppUserMapper;
-import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.account.service.AppUserService;
import com.ruoyi.account.service.AppUserShopService;
+import com.ruoyi.account.util.weChat.WXCore;
import com.ruoyi.account.util.weChat.WeChatUtil;
import com.ruoyi.account.vo.*;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.other.api.domain.PointSetting;
import com.ruoyi.other.api.domain.Shop;
+import com.ruoyi.other.api.feignClient.PointSettingClient;
import com.ruoyi.other.api.feignClient.ShopClient;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
@@ -52,6 +58,9 @@
@Resource
private SysUserClient sysUserClient;
+
+ @Resource
+ private PointSettingClient pointSettingClient;
@@ -73,11 +82,19 @@
return R.fail(map.get("msg").toString());
}
String openid = map.get("openid").toString();
+ String sessionKey = map.get("sessionKey").toString();
//查询用户是否注册，没有注册则跳转到注册页面
AppUser appUser = this.getOne(new LambdaQueryWrapper<AppUser>().eq(AppUser::getWxOpenid, openid).ne(AppUser::getStatus, 3).eq(AppUser::getDelFlag, 0));
if(null == appUser){
+ String decrypt = WXCore.decrypt(appletLogin.getEncryptedData_phone(), sessionKey, appletLogin.getIv_phone());
+ if (StringUtils.isEmpty(decrypt)) {
+ return R.fail("获取手机信息失败");
+ }
+ JSONObject phone = JSON.parseObject(decrypt);
+ String purePhoneNumber = phone.getString("purePhoneNumber");
LoginVo loginVo = new LoginVo();
loginVo.setSkipPage(2);
+ loginVo.setPhone(purePhoneNumber);
return R.ok(loginVo);
}
//账户被冻结，给出提示
@@ -117,6 +134,7 @@
if(null == appUser){
LoginVo loginVo = new LoginVo();
loginVo.setSkipPage(2);
+ loginVo.setPhone(mobileLogin.getPhone());
return R.ok(loginVo);
}
//账户被冻结，给出提示
@@ -204,10 +222,18 @@
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){
+ if(null != appUser1 && StringUtils.isNotEmpty(appUser1.getWxOpenid())){
return R.fail("手机号已注册，请直接登录！");
}
- if(null == appUser){
+ if(null != appUser1 && appUser1.getStatus() == 2){
+ return R.fail("手机号已注册，请直接登录！");
+ }
+ //如果手机号已注册，但是没有微信号，则将微信号添加到已有账户上
+ if(null != appUser1 && StringUtils.isEmpty(appUser1.getWxOpenid())){
+ appUser1.setWxOpenid(openid);
+ this.updateById(appUser1);
+ appUser = appUser1;
+ }else if(null == appUser){
appUser = new AppUser();
appUser.setName(registerAccount.getName());
appUser.setPhone(registerAccount.getPhone());
@@ -237,7 +263,16 @@
appUser.setTotalRedPacketAmount(BigDecimal.ZERO);
appUser.setTotalDistributionAmount(BigDecimal.ZERO);
appUser.setBalance(BigDecimal.ZERO);
- appUser.setLavePoint(0);
+
+ R<PointSetting> pointSettingR = pointSettingClient.getPointSetting(1);
+ if (R.isError(pointSettingR)){
+ throw new RuntimeException("获取积分设置失败");
+ }
+ PointSetting pointSetting = pointSettingR.getData();
+ if (pointSetting == null){
+ throw new RuntimeException("积分设置不存在");
+ }
+ appUser.setLavePoint(pointSetting.getGetRegisPoint());
//根据平台的配置未达标，则标注为可修改推广人
appUser.setChangePromoter(0);
appUser.setLongitude(registerAccount.getLongitude());
@@ -276,11 +311,10 @@
sysUserClient.saveShopUser(user);
}
}
-
}
LoginVo loginVo = new LoginVo();
loginVo.setSkipPage(1);
- loginVo.setFirstTime(false);
+ loginVo.setFirstTime(null == appUser1 ? true : false);
loginVo.setPhone(appUser.getPhone());
//构建token
LoginUser loginUser = new LoginUser();
@@ -360,4 +394,19 @@
return list;
}
+ @Override
+ public AppUser getSuperiorLeader(Long id) {
+ AppUser appUser = getById(id);
+ Long inviteUserId = appUser.getInviteUserId();
+ AppUser inviteUser = getById(inviteUserId);
+ if (inviteUser == null){
+ return null;
+ }
+ if (inviteUser.getVipId() > 3) {
+ return inviteUser;
+ }else {
+ getSuperiorLeader(inviteUserId);
+ }
+ return null;
+ }
}
--
Gitblit v1.7.1