From cf3b4b7fc95fd5b83cae6842e8c24b99e70068e0 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 27 四月 2021 16:55:07 +0800
Subject: [PATCH] 修复bug
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 166 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 100 insertions(+), 66 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 cff81cd..eccb533 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
@@ -518,6 +518,36 @@
return R.fail();
}
+
+ /**
+ * 修改用户志愿者状态
+ *
+ * @param userId 志愿者用户ID
+ * @param type
+ */
+ @Override
+ public R putUserIsVolunteerById(Long userId, int type) {
+ SysUserDO sysUserDO = new SysUserDO();
+ sysUserDO.setIsVolunteer(type);
+ sysUserDO.setUserId(userId);
+
+ SysUserDO userInDB = userDao.selectById(userId);
+ if (userInDB != null) {
+ boolean isVol = userInDB.getIsVolunteer() == 1;
+ if (isVol) {
+ return R.fail("用户已是志愿者");
+ }
+ if (userInDB.getType() != 1) {
+ return R.fail("用户不是小程序用户");
+ }
+ int update = userDao.updateById(sysUserDO);
+ if (update > 0) {
+ return R.ok();
+ }
+ }
+ return R.fail();
+ }
+
/**
* 用户绑定社区、小区
*
@@ -551,6 +581,7 @@
//接入第三方实名认证
String idCard = loginUserInfoVO.getIdCard();
String name = loginUserInfoVO.getName();
+ log.info("用户实名认证发送请求，姓名：" + name + "身份证号码：" + idCard);
boolean b = RealNameUtil.authentication(idCard, name);
if (!b) {
return R.fail("身份认证失败：公安系统认证错误");
@@ -706,6 +737,7 @@
if (!ObjectUtils.isEmpty(comMngFamilyInfoDO1)) {
return R.fail("家庭成员已经存在");
}
+ comMngFamilyInfoDO.setAge(IdCard.IdNOToAge(comMngFamilyInfoVO.getIdCard()));
int insert = comMngFamilyInfoDAO.insert(comMngFamilyInfoDO);
if (insert > 0) {
return R.ok();
@@ -723,6 +755,7 @@
public R putFamily(ComMngFamilyInfoVO comMngFamilyInfoVO) {
ComMngFamilyInfoDO comMngFamilyInfoDO = new ComMngFamilyInfoDO();
BeanUtils.copyProperties(comMngFamilyInfoVO, comMngFamilyInfoDO);
+ comMngFamilyInfoDO.setAge(IdCard.IdNOToAge(comMngFamilyInfoVO.getIdCard()));
int update = comMngFamilyInfoDAO.updateById(comMngFamilyInfoDO);
if (update > 0) {
return R.ok();
@@ -745,11 +778,11 @@
Long communityId = administratorsUserVO.getCommunityId();
//新增社区高级管理员角色
SysRoleDO sysRoleDO = new SysRoleDO();
- if(roleId.intValue() == 999999999){
+ if (roleId.intValue() == 999999999) {
sysRoleDO.setCommunityId(communityId);
sysRoleDO.setRoleName("超级管理员");
sysRoleDO.setRoleKey(Constants.ADMIN_SHOP_ROLE_KEY + communityId);
- }else{
+ } else {
sysRoleDO.setCommunityId(0L);
sysRoleDO.setRoleName(administratorsUserVO.getShopStoreName());
sysRoleDO.setRoleKey(Constants.SHOP_ROLE_KEY + administratorsUserVO.getShopStorePhone());
@@ -1573,46 +1606,34 @@
/**
* 新增SysUser
- * @param storeVO 请求参数
- * @return 新增结果
+ *
+ * @param storeVO 请求参数
+ * @return 新增结果
*/
@Override
- public R addSysUser(ShopStoreVO storeVO){
+ public R addSysUser(ShopStoreVO storeVO) {
SysUserDO sysUserDO = new SysUserDO();
- Long roleId = 888888888L;
- if (roleId.intValue() == 999999999 || roleId.intValue() == 888888888) {
- Long communityId = 0L;
- //新增社区高级管理员角色
- SysRoleDO sysRoleDO = new SysRoleDO();
- if(roleId.intValue() == 999999999){
- sysRoleDO.setCommunityId(communityId);
- sysRoleDO.setRoleName("超级管理员");
- sysRoleDO.setRoleKey(Constants.ADMIN_SHOP_ROLE_KEY + communityId);
- }else{
- sysRoleDO.setCommunityId(0L);
- sysRoleDO.setRoleName(storeVO.getName());
- sysRoleDO.setRoleKey(Constants.SHOP_ROLE_KEY + storeVO.getStoreAccount());
- }
- sysRoleDO.setRoleSort(0);
- sysRoleDO.setCreateBy(storeVO.getLoginUserId());
- int insert = roleDAO.insert(sysRoleDO);
- if (insert > 0) {
- SysRoleDO sysRoleDO1 = roleDAO.selectOne(new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleKey, sysRoleDO.getRoleKey()));
- roleId = sysRoleDO1.getRoleId();
- //新角色设置所有权限
- MenuRoleVO menuRoleVO = new MenuRoleVO();
- menuRoleVO.setIsAll(1);
- menuRoleVO.setCommunityId(communityId);
- menuRoleVO.setRoleId(roleId);
- this.putMenuRole(menuRoleVO);
- }
+ Long communityId = 0L;
+ //新增社区高级管理员角色
+ SysRoleDO sysRoleDO = new SysRoleDO();
+ sysRoleDO.setCommunityId(0L);
+ sysRoleDO.setRoleName(storeVO.getName());
+ sysRoleDO.setRoleKey(Constants.SHOP_ROLE_KEY + storeVO.getStoreAccount());
+ sysRoleDO.setRoleSort(0);
+ sysRoleDO.setCreateBy(storeVO.getLoginUserId());
+ int insert = roleDAO.insert(sysRoleDO);
+ if (insert < 0) {
+ return R.fail();
}
+ //新角色设置所有权限
+ MenuRoleVO menuRoleVO = new MenuRoleVO();
+ menuRoleVO.setIsAll(1);
+ menuRoleVO.setCommunityId(communityId);
+ menuRoleVO.setRoleId(sysRoleDO.getRoleId());
+ this.putMenuRole(menuRoleVO);
- SysRoleDO roleDO = roleDAO.selectById(roleId);
- if (ObjectUtils.isEmpty(roleDO)) {
- return R.fail("角色不存在");
- }
+ //sys_user 表
String encode = new BCryptPasswordEncoder().encode(storeVO.getStorePassword());
BeanUtils.copyProperties(storeVO, sysUserDO);
sysUserDO.setAccount(storeVO.getStoreAccount());
@@ -1622,47 +1643,37 @@
sysUserDO.setPhone(storeVO.getPhone());
sysUserDO.setName(storeVO.getContacts());
sysUserDO.setPassword(encode);
- int insert = 0;
try {
insert = userDao.insert(sysUserDO);
-
//把SysUserId赋值给店铺
- if(sysUserDO.getUserId() != null){
- userDao.updateStoreByPhone(storeVO.getPhone(),sysUserDO.getUserId());
+ if (sysUserDO.getUserId() != null) {
+ userDao.updateStoreByPhone(storeVO.getPhone(), sysUserDO.getUserId());
}
} catch (Exception e) {
e.printStackTrace();
log.error("新增后台用户报错【{}】", e.getMessage());
if (e.getMessage().contains("union_phone_type")) {
- throw new ServiceException("手机号已经存在");
+ userDao.deleteStoreByPhoneAndStatus(storeVO.getPhone());
+ roleDAO.deleteByRoleKey(Constants.SHOP_ROLE_KEY + storeVO.getStoreAccount());
+ return R.fail("手机号已经存在");
} else if (e.getMessage().contains("union_account_type")) {
- throw new ServiceException("账户已经存在");
+ return R.fail("账户已经存在");
}
}
- if (insert > 0) {
- SysUserDO sysUserDO1 = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, 5).eq(SysUserDO::getAccount, storeVO.getStoreAccount()));
- Long userId = sysUserDO1.getUserId();
- SysUserRoleDO sysUserRoleDO = new SysUserRoleDO();
- sysUserRoleDO.setUserId(userId);
- sysUserRoleDO.setRoleId(roleDO.getRoleId());
- int insert1 = sysUserRoleDAO.insert(sysUserRoleDO);
- if (insert1 > 0) {
- return R.ok();
- }
- }
- return R.fail();
+ return R.ok();
}
/**
* 修改SysUser用户信息
- * @param storeVO 请求参数
- * @return 修改结果
+ *
+ * @param storeVO 请求参数
+ * @return 修改结果
*/
@Override
- public R editSysUser(ShopStoreVO storeVO){
- SysUserDO sysUserDO1 = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getPhone,storeVO.getPhone())
- .eq(SysUserDO::getType,5));
- if(sysUserDO1 == null){
+ public R editSysUser(ShopStoreVO storeVO) {
+ SysUserDO sysUserDO1 = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getPhone, storeVO.getPhone())
+ .eq(SysUserDO::getType, 5));
+ if (sysUserDO1 == null) {
return R.fail("未查询到后台管理用户！");
}
String encode = new BCryptPasswordEncoder().encode(storeVO.getStorePassword());
@@ -1675,22 +1686,45 @@
/**
* 修改用户小程序首页活动提示
- * @param userEditTipsDTO 请求参数
- * @return 修改结果
+ *
+ * @param userEditTipsDTO 请求参数
+ * @return 修改结果
*/
- public R editUserTips(SysUserEditTipsDTO userEditTipsDTO){
+ public R editUserTips(SysUserEditTipsDTO userEditTipsDTO) {
//查询用户信息
SysUserDO userDO = userDao.selectById(userEditTipsDTO.getUserId());
- if(userDO == null){
+ if (userDO == null) {
return R.fail("未查询到用户信息");
}
//修改用户信息
userDO.setIsTips(userEditTipsDTO.getIsTips());
userDao.updateById(userDO);
- if(userDao.updateById(userDO) > 0){
+ if (userDao.updateById(userDO) > 0) {
return R.ok();
- }else{
+ } else {
return R.fail();
}
}
+
+ @Override
+ public R getUserArchives(Long userId) {
+ //查询用户信息
+ SysUserDO userDO = userDao.selectById(userId);
+ if (userDO == null) {
+ return R.fail("未查询到用户信息");
+ }
+ UserArchivesVO userArchivesVO = new UserArchivesVO();
+ BeanUtils.copyProperties(userDO, userArchivesVO);
+ userArchivesVO.setUserId(userDO.getUserId());
+ return R.ok(userArchivesVO);
+ }
+
+ @Override
+ public R updateUserArchives(UpdateUserArchivesVO userArchivesVO) {
+ if(userArchivesVO.getUserId()==null){
+ return R.fail("未查询到用户信息");
+ }
+ userDao.updateUserArchives(userArchivesVO);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1