czg_team
/
cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
wangw 2025-02-25 15:59:24 +08:00
parent 4b76578150 2c2d0cb606
commit 41e7c13dd6
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cash-common/cash-common-service/src/main/java/com/czg/account/dto/staff/ShopStaffEditDTO.java
View File

@ -26,6 +26,11 @@ public class ShopStaffEditDTO {
* 员工姓名
*/
private String name;
/**
* 登录账号
*/
@NotEmpty(message = "账号不为空")
private String accountName;
/**
* 登录密码
*/
@ -33,10 +38,12 @@ public class ShopStaffEditDTO {
/**
* 手机号
*/
@NotEmpty(message = "手机号不为空")
private String phone;
/**
* 员工编号
*/
@NotEmpty(message = "编号不为空")
private String code;
/**
* 优惠类型 1 折扣 0 金额

20
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopStaffServiceImpl.java
View File

@ -65,7 +65,25 @@ public class ShopStaffServiceImpl extends ServiceImpl<ShopStaffMapper, ShopStaff
sysUsersRolesService.updateRole(shopStaff.getId(), shopStaffEditDTO.getRoleId());
}
sysUserService.updateSysUserPwd(shopStaff.getId(), shopStaffEditDTO.getAccountPwd());
if (!"*******".equals(shopStaffEditDTO.getAccountPwd())) {
sysUserService.updateSysUserPwd(shopStaff.getId(), shopStaffEditDTO.getAccountPwd());
}
SysUser sysUser = sysUserService.getById(sysUserId);
if (!shopStaffEditDTO.getPhone().equals(sysUser.getPhone())) {
sysUser.setPhone(shopStaffEditDTO.getPhone());
}
if (!shopStaffEditDTO.getAccountName().equals(sysUser.getAccount())) {
long count = sysUserService.count(new QueryWrapper().eq(SysUser::getAccount, shopStaffEditDTO.getAccountName()));
if (count > 0) {
throw new ApiNotPrintException("此账户名已存在");
}
sysUser.setAccount(shopStaffEditDTO.getAccountName());
}
sysUserService.updateById(sysUser);
BeanUtil.copyProperties(shopStaffEditDTO, shopStaff);
updateById(shopStaff);