From 5662c51cf1566d0a882d98ba96b52eef8b5d6ace Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期五, 11 十一月 2022 13:37:42 +0800
Subject: [PATCH] token获取物业id处理
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 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 36aee16..f1133cb 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
@@ -371,6 +371,13 @@
loginUserInfoVO.setIsDpcMember(1);
}
}
+ //是否为物业公司账号
+ if (nonNull(sysUserDO.getPhone())){
+ Long propertyAccount = userDao.isPropertyAccount(sysUserDO.getPhone());
+ if (nonNull(propertyAccount)){
+ loginUserInfoVO.setPropertyId(propertyAccount);
+ }
+ }
return R.ok(loginUserInfoVO);
}
@@ -523,6 +530,13 @@
int i = userDao.isDpcMember(phone, sysUserDO.getName());
if (i>0){
loginUserInfoVO.setIsDpcMember(1);
+ }
+ }
+ //是否为物业公司账号
+ if (nonNull(sysUserDO.getPhone())){
+ Long propertyAccount = userDao.isPropertyAccount(sysUserDO.getPhone());
+ if (nonNull(propertyAccount)){
+ loginUserInfoVO.setPropertyId(propertyAccount);
}
}
return R.ok(loginUserInfoVO);
@@ -1364,6 +1378,7 @@
log.info("======================type"+administratorsUserVO.getType());
if (administratorsUserVO.getType().equals(20)){
roleId=1559112102373756548L;
+ administratorsUserVO.setType(3);
}
log.info("=======================roleId"+roleId);
SysRoleDO roleDO = roleDAO.selectById(roleId);
@@ -2856,7 +2871,8 @@
@Transactional(rollbackFor = Exception.class)
public R addConvenientMerchantUser(ConvenientMerchantDTO convenientMerchantDTO) {
SysUserDO sysUserDO;
- sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getAccount, convenientMerchantDTO.getAccount()));
+ sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getAccount, convenientMerchantDTO.getAccount())
+ .eq(SysUserDO::getPhone,convenientMerchantDTO.getMobilePhone()).eq(SysUserDO::getAppId,"wx118de8a734d269f0"));
if (nonNull(sysUserDO)) {
return R.fail("账户已经存在");
}
@@ -2865,10 +2881,10 @@
String encode = new BCryptPasswordEncoder().encode(convenientMerchantDTO.getPassword());
BeanUtils.copyProperties(convenientMerchantDTO, sysUserDO);
sysUserDO.setAccount(convenientMerchantDTO.getAccount());
- sysUserDO.setType(10);
+ sysUserDO.setType(5);
sysUserDO.setAreaId(null);
sysUserDO.setStatus(1);
- sysUserDO.setPhone(null);
+ sysUserDO.setPhone(convenientMerchantDTO.getMobilePhone());
sysUserDO.setName(convenientMerchantDTO.getContacts());
sysUserDO.setPassword(encode);
try {
@@ -3973,6 +3989,16 @@
return R.ok(sysUserFeedbackDOS);
}
+ @Override
+ public R propertyCheck(String phone) {
+ Long propertyAccount = userDao.isPropertyAccount(phone);
+ log.info("==============物业公司id"+propertyAccount);
+ if (isNull(propertyAccount)){
+ return R.fail();
+ }
+ return R.ok(propertyAccount);
+ }
+
@Override
public R getAreaAndStreet() {
--
Gitblit v1.7.1