From d2542a6123fa6834e01ed3af23c7ba0a02696bc6 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 29 十一月 2024 16:37:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java | 156 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 135 insertions(+), 21 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 de64b48..953d74d 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
@@ -7,14 +7,18 @@
import com.ruoyi.account.service.AppUserService;
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.system.api.vo.LoginUser;
+import com.ruoyi.system.api.model.LoginUser;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -44,12 +48,12 @@
* @return
*/
@Override
- public AjaxResult appletLogin(AppletLogin appletLogin) {
+ public R appletLogin(AppletLogin appletLogin) {
//使用jscode获取微信openid
Map<String, Object> map = weChatUtil.code2Session(appletLogin.getJscode());
Integer errcode = Integer.valueOf(map.get("errcode").toString());
if(0 != errcode){
- return AjaxResult.error(map.get("msg").toString());
+ return R.fail(map.get("msg").toString());
}
String openid = map.get("openid").toString();
//查询用户是否注册，没有注册则跳转到注册页面
@@ -57,11 +61,11 @@
if(null == appUser){
LoginVo loginVo = new LoginVo();
loginVo.setSkipPage(2);
- return AjaxResult.success(loginVo);
+ return R.ok(loginVo);
}
//账户被冻结，给出提示
if(2 == appUser.getStatus()){
- return AjaxResult.error("账户已被冻结，请联系管理员！");
+ return R.fail("账户已被冻结，请联系管理员！");
}
LoginVo loginVo = new LoginVo();
loginVo.setSkipPage(1);
@@ -69,12 +73,12 @@
loginVo.setPhone(appUser.getPhone());
//构建token
LoginUser loginUser = new LoginUser();
- loginUser.setUserId(appUser.getId());
- loginUser.setName(appUser.getName());
+ loginUser.setUserid(appUser.getId());
+ loginUser.setUsername(appUser.getName());
Map<String, Object> tokenApplet = tokenService.createTokenApplet(loginUser);
loginVo.setToken(tokenApplet.get("access_token").toString());
loginVo.setFailureTime(Long.valueOf(tokenApplet.get("expires_in").toString()));
- return AjaxResult.success(loginVo);
+ return R.ok(loginVo);
}
@@ -84,11 +88,11 @@
* @return
*/
@Override
- public AjaxResult<LoginVo> mobileLogin(MobileLogin mobileLogin) {
+ public R<LoginVo> mobileLogin(MobileLogin mobileLogin) {
//校验验证码
String code = redisService.getCacheObject(mobileLogin.getPhone());
if(null == code || !code.equals(mobileLogin.getCode())){
- return AjaxResult.error("验证码错误");
+ return R.fail("验证码错误");
}
//查询用户是否注册，没有注册则跳转到注册页面
@@ -96,11 +100,11 @@
if(null == appUser){
LoginVo loginVo = new LoginVo();
loginVo.setSkipPage(2);
- return AjaxResult.success(loginVo);
+ return R.ok(loginVo);
}
//账户被冻结，给出提示
if(2 == appUser.getStatus()){
- return AjaxResult.error("账户已被冻结，请联系管理员！");
+ return R.fail("账户已被冻结，请联系管理员！");
}
LoginVo loginVo = new LoginVo();
loginVo.setSkipPage(1);
@@ -108,12 +112,12 @@
loginVo.setPhone(appUser.getPhone());
//构建token
LoginUser loginUser = new LoginUser();
- loginUser.setUserId(appUser.getId());
- loginUser.setName(appUser.getName());
+ loginUser.setUserid(appUser.getId());
+ loginUser.setUsername(appUser.getName());
Map<String, Object> tokenApplet = tokenService.createTokenApplet(loginUser);
loginVo.setToken(tokenApplet.get("access_token").toString());
- loginVo.setFailureTime(Long.valueOf(tokenApplet.get("expires_in").toString()));
- return AjaxResult.success(loginVo);
+ loginVo.setFailureTime(Long.valueOf(tokenApplet.get("expires_in").toString()));
+ return R.ok(loginVo);
}
@@ -123,7 +127,7 @@
* @return
*/
@Override
- public AjaxResult getSMSCode(SMSCode smsCode) {
+ public R getSMSCode(SMSCode smsCode) {
//校验验证码获取评率（1分钟5次）
String key = smsCode.getType() + "&" + smsCode.getPhone();
Map<String, Object> cacheMap = redisService.getCacheMap(key);
@@ -131,7 +135,7 @@
Integer number = Integer.valueOf(cacheMap.get("number").toString()) + 1;
Long startTime = Long.valueOf(cacheMap.get("startTime").toString());
if(number > 5 && (System.currentTimeMillis() - startTime) < 60000){
- return AjaxResult.error("获取验证码太频繁，请稍后重试！");
+ return R.fail("获取验证码太频繁，请稍后重试！");
}
if(number <= 5){
cacheMap.put("number", number);
@@ -153,7 +157,7 @@
code += Double.valueOf(Math.random() * 10).intValue();
}
//发送短信 todo 待对接短信
- return AjaxResult.success();
+ return R.ok();
}
@@ -163,7 +167,117 @@
* @return
*/
@Override
- public AjaxResult<LoginVo> registerAccount(RegisterAccount registerAccount) {
- return null;
+ public R<LoginVo> registerAccount(RegisterAccount registerAccount) {
+ //校验验证码
+ String code = redisService.getCacheObject(registerAccount.getPhone());
+ if(null == code || !code.equals(registerAccount.getCode())){
+ 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 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("手机号已注册，请直接登录！");
+ }
+ if(null == appUser){
+ appUser = new AppUser();
+ appUser.setName(registerAccount.getName());
+ appUser.setPhone(registerAccount.getPhone());
+ appUser.setWxOpenid(openid);
+ //注册默认为普通会员
+ appUser.setVipId(1);
+ appUser.setStatus(1);
+ appUser.setCreateTime(LocalDateTime.now());
+ appUser.setDelFlag(false);
+ appUser.setFirstAdd(1);
+ appUser.setLastLoginTime(LocalDateTime.now());
+ //顶级推广人
+ AppUser topAppUser = getTopAppUser(registerAccount.getPromoter());
+ appUser.setTopInviteId(topAppUser.getId());
+ //绑定门店为推荐人绑定的门店
+ AppUser appUser2 = this.getById(registerAccount.getPromoter());
+ appUser.setInviteUserId(registerAccount.getPromoter());
+ appUser.setShopId(appUser2.getShopId());
+ appUser.setPartPoint(BigDecimal.ZERO);
+ appUser.setPartGrowPoint(BigDecimal.ZERO);
+ appUser.setShopPoint(BigDecimal.ZERO);
+ appUser.setSharePoint(BigDecimal.ZERO);
+ appUser.setShopAmount(BigDecimal.ZERO);
+ appUser.setWithdrawableAmount(BigDecimal.ZERO);
+ appUser.setWithdrawnAmount(BigDecimal.ZERO);
+ appUser.setTotalRechargeAmount(BigDecimal.ZERO);
+ appUser.setTotalRedPacketAmount(BigDecimal.ZERO);
+ appUser.setTotalDistributionAmount(BigDecimal.ZERO);
+ appUser.setLavePoint(BigDecimal.ZERO);
+ //根据平台的配置未达标，则标注为可修改推广人
+ appUser.setChangePromoter(0);
+ appUser.setLongitude(registerAccount.getLongitude());
+ appUser.setLatitude(registerAccount.getLatitude());
+ //调用地图获取省市区数据
+// appUser.setProvince();
+// appUser.setProvinceCode();
+// appUser.setCity();
+// appUser.setCityCode();
+// appUser.setDistrict();
+// appUser.setDistrictCode();
+ this.save(appUser);
+ }
+ LoginVo loginVo = new LoginVo();
+ loginVo.setSkipPage(1);
+ loginVo.setFirstTime(false);
+ loginVo.setPhone(appUser.getPhone());
+ //构建token
+ LoginUser loginUser = new LoginUser();
+ loginUser.setUserid(appUser.getId());
+ loginUser.setUsername(appUser.getName());
+ Map<String, Object> tokenApplet = tokenService.createTokenApplet(loginUser);
+ loginVo.setToken(tokenApplet.get("access_token").toString());
+ loginVo.setFailureTime(Long.valueOf(tokenApplet.get("expires_in").toString()));
+ return R.ok(loginVo);
+ }
+
+
+ /**
+ * 递归查询顶级推广人
+ * @param id
+ * @return
+ */
+ public AppUser getTopAppUser(Long id){
+ List<AppUser> list = this.list(new LambdaQueryWrapper<AppUser>().eq(AppUser::getDelFlag, 0));
+ return getTopAppUser(list, id);
+ }
+
+ public AppUser getTopAppUser(List<AppUser> list, Long id){
+ AppUser appUser = list.stream().filter(s -> s.getInviteUserId().equals(id)).findFirst().get();
+ if(null == appUser.getInviteUserId()){
+ return appUser;
+ }
+ return getTopAppUser(list, appUser.getId());
+ }
+
+
+ /**
+ * 获取附近推广人
+ * @param nearbyReferrer
+ * @return
+ */
+ @Override
+ public List<NearbyReferrerVo> getNearbyReferrer(NearbyReferrer nearbyReferrer) {
+ //使用地图获取省市区数据
+ String longitude = nearbyReferrer.getLongitude();
+ String latitude = nearbyReferrer.getLatitude();
+ String cityCode = "";
+ List<NearbyReferrerVo> list = this.baseMapper.getNearbyReferrer(cityCode, nearbyReferrer);
+ return list;
}
}
--
Gitblit v1.7.1