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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wangw
2025-02-27 11:17:27 +08:00
parent 8fa431f976 9c2c35c5cf
commit 1717c94099
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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