From 28acbf00e1f3b431f0c52a201ea06638980b2bc2 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期日, 09 十月 2022 09:23:40 +0800
Subject: [PATCH] Merge branch 'sanshuohuitang_dev' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index 75f86c1..74194bf 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -29,6 +29,7 @@
import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
import com.panzhihua.common.model.vos.community.microCommercialStreet.McsLoginUserInfoVO;
import com.panzhihua.common.model.vos.user.*;
+import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.*;
import com.panzhihua.service_user.dao.*;
import com.panzhihua.service_user.entity.SysAppConfig;
@@ -159,6 +160,8 @@
private SysTemplateConfigDao sysTemplateConfigDao;
@Resource
private ObjectMapper objectMapper;
+ @Resource
+ private CommunityService communityService;
private static final Integer ALLCOUNTY=1;
private static final Integer ALLSTREET=2;
private static final Integer ALLCOMMUNITY=3;
@@ -492,6 +495,11 @@
loginUserInfoVO.setLevel(2);
}else if (isNull(loginUserInfoVO.getLevel())){
loginUserInfoVO.setLevel(1);
+ }
+ //是否为三说会堂专家
+ R expert = communityService.isExpert(loginUserInfoVO.getPhone());
+ if (R.isOk(expert)){
+ loginUserInfoVO.setType(13);
}
return R.ok(loginUserInfoVO);
}
@@ -3754,10 +3762,11 @@
//是否存在相同账号
SysUserDO userDO = userDao.selectOne(new QueryWrapper<SysUserDO>().eq("account", administratorsUserVO.getAccount()));
if (isNull(userDO)){
+ sysUserDO.setAppId("wx0cef797390444b75");
sysUserDO.setCreateAt(new Date());
sysUserDO.setUserId(administratorsUserVO.getUserId());
sysUserDO.setAccount(administratorsUserVO.getAccount());
- sysUserDO.setPassword(administratorsUserVO.getPassword());
+ sysUserDO.setPassword(new BCryptPasswordEncoder().encode(administratorsUserVO.getPassword()));
sysUserDO.setName(administratorsUserVO.getName());
if (nonNull(administratorsUserVO.getImageUrl())){
sysUserDO.setImageUrl(administratorsUserVO.getImageUrl());
@@ -3771,6 +3780,13 @@
sysUserRole.setUserId(sysUserDO.getUserId());
if (sysUserDO.getType().equals(11)){
sysUserRole.setRoleId(Long.parseLong(UserConstants.SANSHUO_EXPERT_ROLE));
+ //将专家小程序账号设置为专家权限
+ SysUserDO sysUserDO1 = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, 1).eq(SysUserDO::getPhone, administratorsUserVO.getPhone()));
+ if (nonNull(sysUserDO1)){
+ sysUserDO1.setType(13);
+ userDao.updateById(sysUserDO1);
+ log.info("添加专家小程序账号权限");
+ }
}else{
sysUserRole.setRoleId(Long.parseLong(UserConstants.SANSHUO_INDUSTRY_CENTER_ROLE));
}
@@ -3788,13 +3804,38 @@
public R resetPassExpertOrIndustryCenter(String account,String password) {
SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().eq("account", account));
if (nonNull(sysUserDO)){
- sysUserDO.setPassword(password);
+ sysUserDO.setPassword(new BCryptPasswordEncoder().encode(password));
userDao.updateById(sysUserDO);
return R.ok();
}
return R.fail("修改失败");
}
+ /**
+ * 移除专家权限
+ * */
+ @Override
+ public R removeExpertRole(String phone) {
+ if (nonNull(phone)){
+ //是否有权限为专家的账号
+ SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, 11).eq(SysUserDO::getPhone, phone));
+ if (nonNull(sysUserDO)){
+ //删除后台账号
+ sysUserDO.setStatus(2);
+ userDao.updateById(sysUserDO);
+ log.info("禁用专家后台账号成功");
+ }
+ //小程序账号移除专家权限
+ SysUserDO sysUserDO1 = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, 13).eq(SysUserDO::getPhone, phone));
+ if (nonNull(sysUserDO1)){
+ sysUserDO1.setType(1);
+ userDao.updateById(sysUserDO1);
+ log.info("移除专家权限成功");
+ }
+ }
+ return R.ok();
+ }
+
@Override
public R getAreaAndStreet() {
--
Gitblit v1.7.1