From d340ca655a4155e0a50d10ddf932ef33a2cc7ef6 Mon Sep 17 00:00:00 2001
From: zhaozhengjie <237651143@qq.com>
Date: 星期三, 28 九月 2022 14:53:54 +0800
Subject: [PATCH] Merge branch '20220927' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 89 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 88 insertions(+), 1 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 8d7b1c7..fc0985b 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
@@ -471,6 +471,28 @@
}
}
loginUserInfoVO.setIsRealNamed(sysUserDO.getIdCard() != null);
+ //是否社区或街道后台
+ int countSocialOrg=userDao.countSocialOrg(sysUserDO.getUserId());
+ if(countSocialOrg>0){
+ loginUserInfoVO.setUserType(3);
+ }
+ else {
+ if(loginUserInfoVO.getStreetId()!=null){
+ loginUserInfoVO.setUserType(1);
+ loginUserInfoVO.setLevel(3);
+ }
+ else {
+ loginUserInfoVO.setUserType(2);
+ loginUserInfoVO.setLevel(4);
+ }
+ }
+ if (sysUserDO.getType().equals(11)){
+ loginUserInfoVO.setLevel(5);
+ }else if (sysUserDO.getType().equals(12)){
+ loginUserInfoVO.setLevel(2);
+ }else if (isNull(loginUserInfoVO.getLevel())){
+ loginUserInfoVO.setLevel(1);
+ }
return R.ok(loginUserInfoVO);
}
@@ -746,10 +768,19 @@
else {
if(loginUserInfoVO.getStreetId()!=null){
loginUserInfoVO.setUserType(1);
+ loginUserInfoVO.setLevel(3);
}
else {
loginUserInfoVO.setUserType(2);
+ loginUserInfoVO.setLevel(4);
}
+ }
+ if (sysUserDO.getType().equals(11)){
+ loginUserInfoVO.setLevel(5);
+ }else if (sysUserDO.getType().equals(12)){
+ loginUserInfoVO.setLevel(2);
+ }else if (isNull(loginUserInfoVO.getLevel())){
+ loginUserInfoVO.setLevel(1);
}
loginUserInfoVO.setBackstageType(1);
String[] account={"dongqu","xiqu","yanbian","miyi","renhe","fantaixinqu"};
@@ -2264,14 +2295,20 @@
String encode = new BCryptPasswordEncoder().encode(storeVO.getStorePassword());
BeanUtils.copyProperties(storeVO, sysUserDO);
sysUserDO.setAccount(storeVO.getStoreAccount());
- sysUserDO.setType(5);
+ sysUserDO.setType(20);
+ sysUserDO.setCommunityId(communityId);
sysUserDO.setAreaId(null);
sysUserDO.setStatus(1);
sysUserDO.setPhone(storeVO.getPhone());
sysUserDO.setName(storeVO.getContacts());
sysUserDO.setPassword(encode);
+ sysUserDO.setAppId("wx0cef797390444b75");
try {
insert = userDao.insert(sysUserDO);
+ SysUserRoleDO sysUserRoleDO = new SysUserRoleDO();
+ sysUserRoleDO.setUserId(sysUserDO.getUserId());
+ sysUserRoleDO.setRoleId(sysRoleDO.getRoleId());
+ sysUserRoleDAO.insert(sysUserRoleDO);
// 把SysUserId赋值给店铺
if (sysUserDO.getUserId() != null) {
userDao.updateStoreByPhone(storeVO.getPhone(), sysUserDO.getUserId());
@@ -3708,6 +3745,56 @@
return R.ok();
}
+ /**
+ * 三说会堂新增业务中心或专家账号
+ * */
+ @Override
+ public R addExpertOrIndustryCenter(AdministratorsUserVO administratorsUserVO) {
+ SysUserDO sysUserDO=new SysUserDO();
+ //是否存在相同账号
+ SysUserDO userDO = userDao.selectOne(new QueryWrapper<SysUserDO>().eq("account", administratorsUserVO.getAccount()));
+ if (isNull(userDO)){
+ sysUserDO.setCreateAt(new Date());
+ sysUserDO.setUserId(administratorsUserVO.getUserId());
+ sysUserDO.setAccount(administratorsUserVO.getAccount());
+ sysUserDO.setPassword(administratorsUserVO.getPassword());
+ sysUserDO.setName(administratorsUserVO.getName());
+ if (nonNull(administratorsUserVO.getImageUrl())){
+ sysUserDO.setImageUrl(administratorsUserVO.getImageUrl());
+ }
+ if (nonNull(administratorsUserVO.getType())){
+ sysUserDO.setType(administratorsUserVO.getType());
+ }
+ userDao.insert(sysUserDO);
+ //分配权限
+ SysUserRoleDO sysUserRole=new SysUserRoleDO();
+ sysUserRole.setUserId(sysUserDO.getUserId());
+ if (sysUserDO.getType().equals(11)){
+ sysUserRole.setRoleId(Long.parseLong(UserConstants.SANSHUO_EXPERT_ROLE));
+ }else{
+ sysUserRole.setRoleId(Long.parseLong(UserConstants.SANSHUO_INDUSTRY_CENTER_ROLE));
+ }
+ //配置权限
+ sysUserRoleDAO.insert(sysUserRole);
+ return R.ok();
+ }
+ return R.fail("账户名已存在");
+ }
+
+ /**
+ * 三说会堂后台重置密码
+ * */
+ @Override
+ public R resetPassExpertOrIndustryCenter(String account,String password) {
+ SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().eq("account", account));
+ if (nonNull(sysUserDO)){
+ sysUserDO.setPassword(password);
+ userDao.updateById(sysUserDO);
+ return R.ok();
+ }
+ return R.fail("修改失败");
+ }
+
@Override
public R getAreaAndStreet() {
--
Gitblit v1.7.1