From 431dde90aa20f7652092fc0bfa9e6a1a28b06b9f Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 06 八月 2023 12:41:23 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/staff/SysStaffServiceImpl.java | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/staff/SysStaffServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/staff/SysStaffServiceImpl.java
index cb00e90..03acb69 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/staff/SysStaffServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/staff/SysStaffServiceImpl.java
@@ -11,8 +11,11 @@
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.constant.SecurityConstant;
+import com.ruoyi.system.api.domain.dto.MerEditUserDto;
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
+import com.ruoyi.system.api.domain.dto.MgtShopStaffEditDto;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
+import com.ruoyi.system.api.service.RemoteShopService;
import com.ruoyi.system.domain.dto.MgtStaffEditDto;
import com.ruoyi.system.domain.dto.MgtStaffPageDto;
import com.ruoyi.system.domain.pojo.staff.SysStaff;
@@ -47,6 +50,9 @@
@Resource
private RedisService redisService;
+
+ @Resource
+ private RemoteShopService remoteShopService;
/**
@@ -158,6 +164,12 @@
sysStaff.setStaffAvatar(mgtStaffEditDto.getStaffAvatar());
sysStaff.setHeadFlag(mgtStaffEditDto.getHeadFlag());
this.saveOrUpdate(sysStaff);
+ MgtShopStaffEditDto mgtShopStaffEditDto = new MgtShopStaffEditDto();
+ mgtShopStaffEditDto.setUserId(sysStaff.getUserId());
+ mgtShopStaffEditDto.setStaffName(sysStaff.getStaffName());
+ mgtShopStaffEditDto.setStaffMobile(sysStaff.getStaffMobile());
+ mgtShopStaffEditDto.setStaffAvatar(sysStaff.getStaffAvatar());
+ remoteShopService.editMgtShopStaff(mgtShopStaffEditDto);
}
/**
@@ -174,7 +186,7 @@
sysStaff.setDelFlag(1);
sysStaff.setStaffMobile(sysStaff.getStaffMobile()+":已删除");
this.saveOrUpdate(sysStaff);
- sysUserService.deleteUserById(mgtBaseGetDto.getUserId());
+ sysUserService.deleteUserById(userId);
}
/**
@@ -250,4 +262,33 @@
}
return accessToken;
}
+
+
+ /**
+ * @description 编辑商户员工
+ * @author jqs
+ * @date 2023/7/19 19:42
+ * @param merEditUserDto
+ * @return void
+ */
+ @Override
+ public void editSysStaffInfo(MerEditUserDto merEditUserDto){
+ SysStaff sysStaff = this.getByUserId(merEditUserDto.getUserId());
+ Integer editType = merEditUserDto.getEditType();
+ switch (editType){
+ case 1:
+ sysStaff.setStaffName(merEditUserDto.getEditValue());
+ break;
+ case 2:
+ sysStaff.setStaffAvatar(merEditUserDto.getEditValue());
+ break;
+ case 3:
+ break;
+ case 4:
+ break;
+ default:
+ break;
+ }
+ this.saveOrUpdate(sysStaff);
+ }
}
--
Gitblit v1.7.1