From f34cb93f17406fa26fcef113a033551ccb373773 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 02 十二月 2024 10:09:32 +0800
Subject: [PATCH] 添加注册账号管理门店账号的业务逻辑
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java | 139 ++++++++++++++++++++++++++++++---------------
1 files changed, 92 insertions(+), 47 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 5ca3e21..0cf053a 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
@@ -2,15 +2,21 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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.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.core.web.page.BaseTable;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.other.api.domain.Shop;
+import com.ruoyi.other.api.feignClient.ShopClient;
+import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.model.LoginUser;
import org.springframework.stereotype.Service;
@@ -41,6 +47,20 @@
@Resource
private RedisService redisService;
+ @Resource
+ private ShopClient shopClient;
+
+ @Resource
+ private AppUserShopService appUserShopService;
+
+ @Resource
+ private SysUserClient sysUserClient;
+
+
+
+
+
+
/**
* 小程序一键登录
@@ -48,12 +68,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();
//查询用户是否注册，没有注册则跳转到注册页面
@@ -61,11 +81,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);
@@ -78,7 +98,7 @@
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);
}
@@ -88,23 +108,23 @@
* @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("验证码错误");
- }
+// String code = redisService.getCacheObject(mobileLogin.getPhone());
+// if(null == code || !code.equals(mobileLogin.getCode())){
+// return R.fail("验证码错误");
+// }
//查询用户是否注册，没有注册则跳转到注册页面
AppUser appUser = this.getOne(new LambdaQueryWrapper<AppUser>().eq(AppUser::getPhone, mobileLogin.getPhone()).ne(AppUser::getStatus, 3).eq(AppUser::getDelFlag, 0));
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);
@@ -117,7 +137,7 @@
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);
}
@@ -127,7 +147,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);
@@ -135,7 +155,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);
@@ -157,7 +177,7 @@
code += Double.valueOf(Math.random() * 10).intValue();
}
//发送短信 todo 待对接短信
- return AjaxResult.success();
+ return R.ok();
}
@@ -167,33 +187,34 @@
* @return
*/
@Override
- public AjaxResult<LoginVo> registerAccount(RegisterAccount registerAccount) {
+ public R<LoginVo> registerAccount(RegisterAccount registerAccount) {
//校验验证码
- String code = redisService.getCacheObject(registerAccount.getPhone());
- if(null == code || !code.equals(registerAccount.getCode())){
- return AjaxResult.error("验证码错误");
- }
+// 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 AjaxResult.error(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 AjaxResult.error("此微信号已注册，请直接登录！");
- }
+// 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;
AppUser appUser1 = this.getOne(new LambdaQueryWrapper<AppUser>().eq(AppUser::getPhone, registerAccount.getPhone()).ne(AppUser::getStatus, 3).eq(AppUser::getDelFlag, 0));
if(null != appUser1){
- return AjaxResult.error("手机号已注册，请直接登录！");
+ return R.fail("手机号已注册，请直接登录！");
}
if(null == appUser){
appUser = new AppUser();
appUser.setName(registerAccount.getName());
appUser.setPhone(registerAccount.getPhone());
- appUser.setWxOpenid(openid);
+// appUser.setWxOpenid(openid);
//注册默认为普通会员
appUser.setVipId(1);
appUser.setStatus(1);
@@ -224,13 +245,40 @@
appUser.setLongitude(registerAccount.getLongitude());
appUser.setLatitude(registerAccount.getLatitude());
//调用地图获取省市区数据
- appUser.setProvince();
- appUser.setProvinceCode();
- appUser.setCity();
- appUser.setCityCode();
- appUser.setDistrict();
- appUser.setDistrictCode();
+// appUser.setProvince();
+// appUser.setProvinceCode();
+// appUser.setCity();
+// appUser.setCityCode();
+// appUser.setDistrict();
+// appUser.setDistrictCode();
this.save(appUser);
+
+ //查询当前注册的手机号是都和门店管理员手机号相同
+ Shop shop = shopClient.getShopByPhone(registerAccount.getPhone()).getData();
+ if(null != shop){
+ //添加门店用户关系数据
+ AppUserShop appUserShop = appUserShopService.getOne(new LambdaQueryWrapper<AppUserShop>().eq(AppUserShop::getAppUserId, appUser.getId()).eq(AppUserShop::getShopId, shop.getId()));
+ if(null == appUserShop){
+ appUserShop = new AppUserShop();
+ appUserShop.setShopId(shop.getId());
+ appUserShop.setAppUserId(appUser.getId());
+ appUserShopService.save(appUserShop);
+ //添加管理后台账号
+ SysUser user = new SysUser();
+ user.setDeptId(1L);
+ user.setUserName(appUser.getName());
+ user.setNickName(appUser.getName());
+ user.setPhonenumber(appUser.getPhone());
+ user.setAvatar(appUser.getAvatar());
+ user.setStatus("0");
+ user.setDelFlag("0");
+ user.setRoleType(2);
+ user.setObjectId(shop.getId());
+ user.setAppUserId(appUser.getId());
+ sysUserClient.saveShopUser(user);
+ }
+ }
+
}
LoginVo loginVo = new LoginVo();
loginVo.setSkipPage(1);
@@ -243,7 +291,7 @@
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);
}
@@ -272,15 +320,12 @@
* @return
*/
@Override
- public BaseTable<NearbyReferrerVo> getNearbyReferrer(NearbyReferrer nearbyReferrer) {
+ public List<NearbyReferrerVo> getNearbyReferrer(NearbyReferrer nearbyReferrer) {
//使用地图获取省市区数据
String longitude = nearbyReferrer.getLongitude();
String latitude = nearbyReferrer.getLatitude();
String cityCode = "";
List<NearbyReferrerVo> list = this.baseMapper.getNearbyReferrer(cityCode, nearbyReferrer);
- BaseTable baseTable = new BaseTable();
- baseTable.setRows(list);
- baseTable.setTotal(list.size());
- return baseTable;
+ return list;
}
}
--
Gitblit v1.7.1