From aed4e4c7d76de4d0fbfe8c0b26fcdeecbd5c5b24 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 26 五月 2023 18:04:47 +0800
Subject: [PATCH] 管理台用户管理
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java | 50 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 34 insertions(+), 16 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
index 8a0922d..e6808ed 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
@@ -3,21 +3,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.shop.domain.dto.MerAgencyPageDto;
-import com.ruoyi.shop.domain.dto.MerMemberTaskPageDto;
-import com.ruoyi.shop.domain.dto.MerShopCertificateEditDto;
-import com.ruoyi.shop.domain.dto.MerShopCertificateListDto;
-import com.ruoyi.shop.domain.vo.MerAgencyPageVo;
-import com.ruoyi.shop.domain.vo.MerMemberTaskPageVo;
-import com.ruoyi.shop.domain.vo.MerShopCertificateListVo;
-import com.ruoyi.shop.domain.vo.MgtShopInfoVo;
-import com.ruoyi.shop.service.shop.ShopCertificateService;
-import com.ruoyi.shop.service.shop.ShopService;
-import com.ruoyi.shop.service.shop.ShopStaffService;
-import com.ruoyi.system.api.domain.dto.MerBaseDto;
-import com.ruoyi.system.api.domain.dto.MerBaseGetDto;
-import com.ruoyi.system.api.domain.dto.MerEditUserDto;
-import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
+import com.ruoyi.shop.domain.dto.*;
+import com.ruoyi.shop.domain.vo.*;
+import com.ruoyi.shop.service.shop.*;
+import com.ruoyi.system.api.domain.dto.*;
import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
import com.ruoyi.system.api.domain.vo.MerStaffInfoVo;
import io.swagger.annotations.Api;
@@ -51,6 +40,11 @@
@Autowired
private ShopStaffService shopStaffService;
+
+
+
+ @Autowired
+ private ShopSuggestService shopSuggestService;
/**
* 未完成实际统计
@@ -110,10 +104,34 @@
}
@RequestMapping(value = "/editShopStaffInfo", method = RequestMethod.POST)
- @ApiOperation(value = "获取员工信息")
+ @ApiOperation(value = "修改员工信息")
public R editShopStaffInfo(@RequestBody MerEditUserDto merEditUserDto) {
Long userId = SecurityUtils.getUserId();
+ merEditUserDto.setUserId(userId);
shopStaffService.editShopStaffInfo(merEditUserDto);
return R.ok();
}
+
+
+
+ @RequestMapping(value = "/pageMerShopSuggest", method = RequestMethod.POST)
+ @ApiOperation(value = "分页获取商户建议")
+ public R<Page<MerShopSuggestVo>> pageMerShopSuggest(@RequestBody MerPageDto merPageDto) {
+ Long userId = SecurityUtils.getUserId();
+ merPageDto.setUserId(userId);
+ Page<MerShopSuggestVo> page = new Page<>();
+ page.setSize(merPageDto.getPageSize());
+ page.setCurrent(merPageDto.getPageNum());
+ List<MerShopSuggestVo> merShopSuggestVoList = shopSuggestService.pageMerShopSuggest(page,merPageDto);
+ return R.ok(page.setRecords(merShopSuggestVoList));
+ }
+
+ @RequestMapping(value = "/suggest", method = RequestMethod.POST)
+ @ApiOperation(value = "建议")
+ public R suggest(@RequestBody MerShopSuggestDto merShopSuggestDto) {
+ Long userId = SecurityUtils.getUserId();
+ merShopSuggestDto.setUserId(userId);
+ shopSuggestService.suggest(merShopSuggestDto);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1