From 2c2d0cb6067dc8acdc4c1a5a999f951046b557c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Tue, 25 Feb 2025 15:58:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E8=B4=A6=E5=8F=B7=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../account/dto/staff/ShopStaffEditDTO.java   |  7 +++++++
 .../service/impl/ShopStaffServiceImpl.java    | 20 ++++++++++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/staff/ShopStaffEditDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/staff/ShopStaffEditDTO.java
index 701f5529..6feb756b 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/staff/ShopStaffEditDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/staff/ShopStaffEditDTO.java
@@ -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 金额
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopStaffServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopStaffServiceImpl.java
index a96dc31e..36e932b3 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopStaffServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopStaffServiceImpl.java
@@ -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);