From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopStaffService.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopStaffService.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopStaffService.java
index 85dfd7a..79b1860 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopStaffService.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopStaffService.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.shop.domain.pojo.shop.ShopStaff;
import com.ruoyi.system.api.domain.dto.MerEditUserDto;
+import com.ruoyi.system.api.domain.dto.MgtShopStaffEditDto;
+import com.ruoyi.system.api.domain.poji.shop.Shop;
import com.ruoyi.system.api.domain.vo.MerStaffInfoVo;
/**
@@ -34,11 +36,26 @@
* @param userId
* @return
*/
- MerStaffInfoVo getShopStaffInfo(Long userId);
+ MerStaffInfoVo getShopStaffInfo(Long userId, Shop shop);
/**
- *
+ * 编辑商户员工信息
* @param merEditUserDto
*/
void editShopStaffInfo(MerEditUserDto merEditUserDto);
+
+ /**
+ * 清空商户员工关联
+ * @param shopId
+ */
+ void clearShopStaffRelation(Long shopId);
+
+ /**
+ * @description 修改商户员工信息
+ * @author jqs
+ * @date 2023/7/19 19:03
+ * @param mgtShopStaffEditDto
+ * @return void
+ */
+ void editMgtShopStaff(MgtShopStaffEditDto mgtShopStaffEditDto);
}
--
Gitblit v1.7.1