Skip to content

P
peizhen-java
Commit 29c4fe4f by 邹磊浩
Options

修改代码

parent 11515084
Showing with 124 additions and 34 deletions
pz-admin/src/main/java/com/pz/web/controller/system/SysUserController.java
......@@ -162,6 +162,7 @@ public class SysUserController extends BaseController {
} else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {
return R.fail("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
}
user.setPassword(BCrypt.hashpw(user.getPassword()));
return toAjax(userService.updateUser(user));
}
......
pz-common/src/main/java/com/pz/common/core/domain/entity/SysUser.java
......@@ -91,7 +91,6 @@ public class SysUser extends BaseEntity {
* 用户头像
*/
private String avatar;
/**
* 密码
*/
......@@ -164,6 +163,9 @@ public class SysUser extends BaseEntity {
@TableField(exist = false)
private Long roleId;
@TableField(exist = false)
private String roleName;
public SysUser(Long userId) {
this.userId = userId;
}
......
pz-system/src/main/java/com/pz/system/domain/vo/DbghOrderVo.java
......@@ -135,4 +135,8 @@ public class DbghOrderVo {
private Integer tStatus;
private Date createTime;
private String isSatisfaction;
private String evaluationContent;
}
pz-system/src/main/java/com/pz/system/domain/vo/DbmyOrderVo.java
......@@ -173,4 +173,9 @@ public class DbmyOrderVo {
*/
@ExcelProperty(value = "订单状态")
private Integer tStatus;
private String isSatisfaction;
private String evaluationContent;
}
pz-system/src/main/java/com/pz/system/domain/vo/DbwzOrderVo.java
......@@ -165,4 +165,9 @@ public class DbwzOrderVo {
*/
@ExcelProperty(value = "订单状态")
private Integer tStatus;
private String isSatisfaction;
private String evaluationContent;
}
pz-system/src/main/java/com/pz/system/domain/vo/ZyphOrderVo.java
......@@ -148,4 +148,8 @@ public class ZyphOrderVo {
private UserVsitorVo userVsitorVo;
private Date createTime;
private String isSatisfaction;
private String evaluationContent;
}
pz-system/src/main/java/com/pz/system/service/impl/StoreApplyServiceImpl.java
......@@ -3,6 +3,7 @@ package com.pz.system.service.impl;
import cn.dev33.satoken.secure.BCrypt;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.pz.common.core.domain.entity.SysRole;
import com.pz.common.core.domain.entity.SysUser;
import com.pz.common.core.page.TableDataInfo;
import com.pz.common.core.domain.PageQuery;
......@@ -12,8 +13,10 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.pz.common.enums.UserType;
import com.pz.common.helper.LoginHelper;
import com.pz.system.domain.StoreInfo;
import com.pz.system.domain.SysUserRole;
import com.pz.system.mapper.StoreInfoMapper;
import com.pz.system.mapper.SysUserMapper;
import com.pz.system.mapper.SysUserRoleMapper;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.pz.system.domain.bo.StoreApplyBo;
......@@ -45,6 +48,8 @@ public class StoreApplyServiceImpl implements IStoreApplyService {
private final StoreInfoMapper storeInfoMapper;
private final SysUserRoleMapper sysUserRoleMapper;
/**
* 查询商城商户申请
*/
......@@ -55,7 +60,7 @@ public class StoreApplyServiceImpl implements IStoreApplyService {
@Override
public StoreApplyVo queryByUserId() {
return baseMapper.selectVoOne(new LambdaQueryWrapper<StoreApply>().eq(StoreApply::getUid,LoginHelper.getLoginUser().getUserId()));
return baseMapper.selectVoOne(new LambdaQueryWrapper<StoreApply>().eq(StoreApply::getUid, LoginHelper.getLoginUser().getUserId()));
}
/**
......@@ -146,6 +151,11 @@ public class StoreApplyServiceImpl implements IStoreApplyService {
sysUser.setPassword(BCrypt.hashpw("123456"));
sysUserMapper.insert(sysUser);
SysUserRole sysUserRole = new SysUserRole();
sysUserRole.setUserId(sysUser.getUserId());
sysUserRole.setRoleId(3L);
sysUserRoleMapper.insert(sysUserRole);
});
}
return baseMapper.updateById(update) > 0;
......
pz-system/src/main/java/com/pz/system/service/impl/SysUserServiceImpl.java
......@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.pz.common.constant.CacheNames;
......@@ -42,6 +43,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Optional;
/**
* 用户 业务层处理
......@@ -65,6 +67,19 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
@Override
public TableDataInfo<SysUser> selectPageUserList(SysUser user, PageQuery pageQuery) {
Page<SysUser> page = baseMapper.selectPageUserList(pageQuery.build(), this.buildQueryWrapper(user));
Optional.ofNullable(page.getRecords()).ifPresent(
sysUsers -> {
sysUsers.forEach(sysUser -> {
Optional.ofNullable(userRoleMapper.selectOne(Wrappers.<SysUserRole>lambdaQuery().eq(SysUserRole::getUserId, sysUser.getUserId())))
.ifPresent(sysUserRole -> {
Optional.ofNullable(roleMapper.selectById(sysUserRole.getRoleId()))
.ifPresent(sysRole -> {
sysUser.setRoleName(sysRole.getRoleName());
});
});
});
}
);
return TableDataInfo.build(page);
}
......@@ -311,14 +326,14 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
@Transactional(rollbackFor = Exception.class)
public int updateUser(SysUser user) {
Long userId = user.getUserId();
/*// 删除用户与角色关联
// 删除用户与角色关联
userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, userId));
// 新增用户与角色管理
insertUserRole(user);
// 删除用户与岗位关联
userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().eq(SysUserPost::getUserId, userId));
// 新增用户与岗位管理
insertUserPost(user);*/
// // 删除用户与岗位关联
// userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().eq(SysUserPost::getUserId, userId));
// // 新增用户与岗位管理
// insertUserPost(user);
return baseMapper.updateById(user);
}
......@@ -492,17 +507,17 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
public UserIdentityVo checkUserIdentity(Integer userId) {
UserIdentityVo userIdentityVo = new UserIdentityVo();
SysUser sysUser = baseMapper.selectById(userId);
if(null == sysUser){
if (null == sysUser) {
return userIdentityVo;
}
if(sysUser.getUserType().equals(UserType.SYS_USER.getUserType())){
if (sysUser.getUserType().equals(UserType.SYS_USER.getUserType())) {
userIdentityVo.setUserType(1);
}else if(sysUser.getUserType().equals(UserType.APP_USER.getUserType())){
} else if (sysUser.getUserType().equals(UserType.APP_USER.getUserType())) {
Employees employees = employeesMapper.selectOne(new LambdaQueryWrapper<Employees>().eq(Employees::getUid, sysUser.getUserId()));
userIdentityVo.setUserType(2);
userIdentityVo.setEmCmId(employees.getId());
userIdentityVo.setEmCmStatus(employees.getStatus());
}else if(sysUser.getUserType().equals(UserType.AMERCHANT_USER.getUserType())){
} else if (sysUser.getUserType().equals(UserType.AMERCHANT_USER.getUserType())) {
Company company = companyMapper.selectOne(new LambdaQueryWrapper<Company>().eq(Company::getUid, sysUser.getUserId()));
userIdentityVo.setUserType(3);
userIdentityVo.setEmCmId(company.getId());
......
pz-system/src/main/resources/mapper/system/SysUserMapper.xml
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.pz.system.mapper.SysUserMapper">
<resultMap type="SysUser" id="SysUserResult">
......@@ -81,43 +81,87 @@
r.data_scope,
r.status as role_status
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role sur on u.user_id = sur.user_id
left join sys_role r on r.role_id = sur.role_id
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role sur on u.user_id = sur.user_id
left join sys_role r on r.role_id = sur.role_id
</sql>
<select id="selectPageUserList" resultMap="SysUserResult">
select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,
u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader
select u.user_id,
u.dept_id,
u.nick_name,
u.user_name,
u.email,
u.avatar,
u.phonenumber,
u.sex,
u.status,
u.del_flag,
u.login_ip,
u.login_date,
u.create_by,
u.create_time,
u.remark,
d.dept_name,
d.leader
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
${ew.getCustomSqlSegment}
left join sys_dept d on u.dept_id = d.dept_id
${ew.getCustomSqlSegment}
</select>
<select id="selectUserList" resultMap="SysUserResult">
select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,
u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader
select u.user_id,
u.dept_id,
u.nick_name,
u.user_name,
u.email,
u.avatar,
u.phonenumber,
u.sex,
u.status,
u.del_flag,
u.login_ip,
u.login_date,
u.create_by,
u.create_time,
u.remark,
d.dept_name,
d.leader
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
${ew.getCustomSqlSegment}
left join sys_dept d on u.dept_id = d.dept_id
${ew.getCustomSqlSegment}
</select>
<select id="selectAllocatedList" resultMap="SysUserResult">
select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
select distinct u.user_id,
u.dept_id,
u.user_name,
u.nick_name,
u.email,
u.phonenumber,
u.status,
u.create_time
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role sur on u.user_id = sur.user_id
left join sys_role r on r.role_id = sur.role_id
${ew.getCustomSqlSegment}
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role sur on u.user_id = sur.user_id
left join sys_role r on r.role_id = sur.role_id
${ew.getCustomSqlSegment}
</select>
<select id="selectUnallocatedList" resultMap="SysUserResult">
select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
select distinct u.user_id,
u.dept_id,
u.user_name,
u.nick_name,
u.email,
u.phonenumber,
u.status,
u.create_time
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role sur on u.user_id = sur.user_id
left join sys_role r on r.role_id = sur.role_id
${ew.getCustomSqlSegment}
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role sur on u.user_id = sur.user_id
left join sys_role r on r.role_id = sur.role_id
${ew.getCustomSqlSegment}
</select>
<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment