From 533d26dae76cb5e54e84d6105f7aee42dcb9f76b Mon Sep 17 00:00:00 2001
From: CBin <497303054@qq.com>
Date: 星期三, 02 八月 2023 21:15:25 +0800
Subject: [PATCH] 接入微信支付
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtStaffController.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtStaffController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtStaffController.java
index 6a32e70..603a3bd 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtStaffController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtStaffController.java
@@ -3,19 +3,20 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
-import com.ruoyi.system.domain.dto.MgtReplayStaffSuggestDto;
-import com.ruoyi.system.domain.dto.MgtStaffEditDto;
-import com.ruoyi.system.domain.dto.MgtStaffSuggestPageDto;
-import com.ruoyi.system.domain.dto.MgtTagStaffSuggestDto;
+import com.ruoyi.system.domain.dto.*;
import com.ruoyi.system.domain.vo.MgtDeptStaffListVo;
+import com.ruoyi.system.domain.vo.MgtStaffPageVo;
import com.ruoyi.system.domain.vo.MgtStaffSuggestPageVo;
import com.ruoyi.system.domain.vo.MgtStaffSuggestTagVo;
import com.ruoyi.system.service.config.StaffSuggestService;
import com.ruoyi.system.service.staff.SysStaffService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -32,7 +33,7 @@
* @description: TODO
* @date 2023 2023/6/11 18:36
*/
-@Api(value = "平台端员工相关接口", tags = "平台端员工相关接口", description = "平台端员工相关接口")
+@Api(value = "管理后台员工相关接口", tags = "管理后台员工相关接口", description = "管理后台员工相关接口")
@RestController
@RequestMapping("/mgt/staff")
public class MgtStaffController {
@@ -75,7 +76,7 @@
@RequestMapping(value = "/exportPageMgtStaffSuggest", method = RequestMethod.POST)
@ApiOperation(value = "导出员工建议列表")
- public void exportPageMgtStaffSuggest(@RequestBody MgtStaffSuggestPageDto mgtStaffSuggestPageDto, HttpServletResponse response) {
+ public void exportPageMgtStaffSuggest(MgtStaffSuggestPageDto mgtStaffSuggestPageDto, HttpServletResponse response) {
Long userId = SecurityUtils.getUserId();
mgtStaffSuggestPageDto.setUserId(userId);
Page<MgtStaffSuggestPageVo> page = new Page<>();
@@ -87,6 +88,7 @@
}
@RequestMapping(value = "/mgtReplayStaffSuggest", method = RequestMethod.POST)
+ @Log(title = "建议管理", businessType = BusinessType.UPDATE,operContent = "平台回复会员建议")
@ApiOperation(value = "平台回复会员建议")
public R mgtReplayStaffSuggest(@RequestBody MgtReplayStaffSuggestDto mgtReplayStaffSuggestDto) {
Long userId = SecurityUtils.getUserId();
@@ -103,6 +105,7 @@
}
@RequestMapping(value = "/mgtEditStaffSuggestTag", method = RequestMethod.POST)
+ @Log(title = "建议管理", businessType = BusinessType.UPDATE,operContent = "编辑会员建议标签")
@ApiOperation(value = "平台编辑会员建议标签")
public R mgtEditStaffSuggestTag(@RequestBody MgtTagStaffSuggestDto mgtTagStaffSuggestDto) {
Long userId = SecurityUtils.getUserId();
@@ -111,9 +114,22 @@
return R.ok();
}
+ @RequestMapping(value = "/pageMgtStaff", method = RequestMethod.POST)
+ @ApiOperation(value = "平台获取员工列表")
+ public R<Page<MgtStaffPageVo>> pageMgtStaff(@RequestBody MgtStaffPageDto mgtStaffPageDto) {
+ Long userId = SecurityUtils.getUserId();
+ mgtStaffPageDto.setUserId(userId);
+ Page<MgtStaffPageVo> page = new Page<>();
+ page.setSize(mgtStaffPageDto.getPageSize());
+ page.setCurrent(mgtStaffPageDto.getPageNum());
+ List<MgtStaffPageVo> staffPageVoList = sysStaffService.pageMgtStaff(page,mgtStaffPageDto);
+ return R.ok(page.setRecords(staffPageVoList));
+ }
+
@RequestMapping(value = "/mgtEditStaff", method = RequestMethod.POST)
+ @Log(title = "员工管理", businessType = BusinessType.UPDATE,operContent = "编辑员工")
@ApiOperation(value = "平台编辑员工")
- public R mgtEditStaff(@RequestBody MgtStaffEditDto mgtStaffEditDto) {
+ public R mgtEditStaff(@Validated @RequestBody MgtStaffEditDto mgtStaffEditDto) {
Long userId = SecurityUtils.getUserId();
mgtStaffEditDto.setUserId(userId);
sysStaffService.mgtStaffEdit(mgtStaffEditDto);
@@ -121,6 +137,7 @@
}
@RequestMapping(value = "/mgtDeleteStaff", method = RequestMethod.POST)
+ @Log(title = "员工管理", businessType = BusinessType.DELETE,operContent = "删除员工")
@ApiOperation(value = "平台删除员工")
public R mgtStaffEdit(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
Long userId = SecurityUtils.getUserId();
--
Gitblit v1.7.1