From 11899dc62d10c1c7778fbebb631f5ee25705b7db Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 17 十一月 2022 21:36:08 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 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 15fc6e5..fca3336 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
@@ -331,6 +331,14 @@
return R.fail();
}
LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
+ //获取后台商家user
+ SysUserDO sysUser = userDao.selectOne(
+ new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, 5).eq(SysUserDO::getPhone, sysUserDO.getPhone()).eq(SysUserDO::getAppId, appId));
+ //判断是否是商家账号
+ if (nonNull(sysUser)){
+ loginUserInfoVO.setBackstageUserId(sysUser.getUserId());
+ loginUserInfoVO.setBackstageType(5);
+ }
if (nonNull(sysUserDO.getStreetId())){
loginUserInfoVO.setStreetId(sysUserDO.getStreetId());
}
@@ -531,6 +539,14 @@
if (i>0){
loginUserInfoVO.setIsDpcMember(1);
}
+ }
+ //获取后台商家user
+ SysUserDO sysUser = userDao.selectOne(
+ new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, 5).eq(SysUserDO::getPhone, sysUserDO.getPhone()).eq(SysUserDO::getAppId, "wx118de8a734d269f0"));
+ //判断是否是商家账号
+ if (nonNull(sysUser)){
+ loginUserInfoVO.setBackstageUserId(sysUser.getUserId());
+ loginUserInfoVO.setBackstageType(5);
}
//是否为物业公司账号
if (nonNull(sysUserDO.getPhone())){
@@ -1358,7 +1374,6 @@
menu.add(300L);
menu.add(303L);
}
-
sysRoleDO.setRoleSort(0);
sysRoleDO.setCreateBy(administratorsUserVO.getUserId());
SysRoleDO sysRoleDO1 = roleDAO.selectOne(
@@ -1376,10 +1391,6 @@
}
}
log.info("======================type"+administratorsUserVO.getType());
- if (administratorsUserVO.getType().equals(20)){
- roleId=1559112102373756548L;
- administratorsUserVO.setType(3);
- }
log.info("=======================roleId"+roleId);
SysRoleDO roleDO = roleDAO.selectById(roleId);
if (ObjectUtils.isEmpty(roleDO)) {
@@ -1388,6 +1399,9 @@
String encode = new BCryptPasswordEncoder().encode(administratorsUserVO.getPassword());
administratorsUserVO.setPassword(encode);
BeanUtils.copyProperties(administratorsUserVO, sysUserDO);
+ if (nonNull(administratorsUserVO.getAppid())){
+ sysUserDO.setAppId(administratorsUserVO.getAppid());
+ }
int insert = 0;
try {
insert = userDao.insert(sysUserDO);
@@ -3983,7 +3997,7 @@
}
SysUserFeedbackDO sysUserFeedbackDO1 = sysUserFeedbackDAO.selectById(sysUserFeedbackVO.getId());
sysUserFeedbackDO1.setReply(sysUserFeedbackVO.getReply());
- return R.ok(sysUserFeedbackDAO.updateById(sysUserFeedbackDO1));
+ return R.ok(sysUserFeedbackDAO.reply(sysUserFeedbackDO1));
}
@Override
--
Gitblit v1.7.1