From 61b5f9863f14ab4fc9da504ca2b553a778eb2e2c Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 24 一月 2024 15:10:32 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/staff/StaffShopController.java | 52 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 42 insertions(+), 10 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/staff/StaffShopController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/staff/StaffShopController.java
index 1b1f773..69f4332 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/staff/StaffShopController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/staff/StaffShopController.java
@@ -3,16 +3,11 @@
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.StaffShopCCEditDto;
-import com.ruoyi.shop.domain.dto.StaffShopECEditDto;
-import com.ruoyi.shop.domain.dto.StaffShopEstimateEditDto;
-import com.ruoyi.shop.domain.dto.StaffShopPageDto;
-import com.ruoyi.shop.domain.vo.StaffHomeShopTotalVo;
-import com.ruoyi.shop.domain.vo.StaffShopInfoGetVo;
-import com.ruoyi.shop.domain.vo.StaffShopPageVo;
-import com.ruoyi.shop.domain.vo.StaffShopSimpleTotalVo;
+import com.ruoyi.shop.domain.dto.*;
+import com.ruoyi.shop.domain.vo.*;
import com.ruoyi.shop.service.shop.ShopService;
import com.ruoyi.system.api.domain.dto.StaffBaseGetDto;
+import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.service.RemoteSysStaffService;
import com.ruoyi.system.api.service.RemoteUserService;
import io.swagger.annotations.Api;
@@ -56,13 +51,34 @@
@ApiOperation(value = "分页获取员工端商户列表")
public R<Page<StaffShopPageVo>> listStaffShop(@RequestBody StaffShopPageDto staffShopPageDto) {
Long userId = SecurityUtils.getUserId();
- if (remoteSysStaffService.isLeader()) {
+// if (remoteSysStaffService.isLeader()) {
+// List<Long> userIds = sysUserService.getUserIdsByDept(userId).getData();
+// userIds.add(userId);
+// staffShopPageDto.setUserIdList(userIds);
+// } else {
+// staffShopPageDto.setBelongUserId(userId);
+// }
+
+ // TODO: 2023/12/5 统一改成使用权限来控制数据
+ R<SysUser> sysUser = sysUserService.getSysUser(userId);
+ if(sysUser.getCode() != 200){
+ return R.fail(sysUser.getMsg());
+ }
+ //员工端数据权限（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限）
+ //2/4暂未使用
+ String dataScopeEmployee = sysUser.getData().getDataScopeEmployee();
+ if(dataScopeEmployee.equals("1")){
+ staffShopPageDto.setUserIdList(null);
+ }
+ if(dataScopeEmployee.equals("3")){
List<Long> userIds = sysUserService.getUserIdsByDept(userId).getData();
userIds.add(userId);
staffShopPageDto.setUserIdList(userIds);
- } else {
+ }
+ if(dataScopeEmployee.equals("5")){
staffShopPageDto.setBelongUserId(userId);
}
+
Page<StaffShopPageVo> page = new Page<>();
page.setSize(staffShopPageDto.getPageSize());
page.setCurrent(staffShopPageDto.getPageNum());
@@ -114,5 +130,21 @@
return R.ok();
}
+ @RequestMapping(value = "/editShopDetail", method = RequestMethod.POST)
+ @ApiOperation(value = "修改店铺详细资料")
+ public R editShopDetail(@RequestBody StaffShopDetailDto staffShopDetailDto) {
+ Long userId = SecurityUtils.getUserId();
+ staffShopDetailDto.setUserId(userId);
+ shopService.editShopDetail(staffShopDetailDto);
+ return R.ok();
+ }
+ @RequestMapping(value = "/getShopDetail", method = RequestMethod.POST)
+ @ApiOperation(value = "获取店铺详细资料")
+ public R<StaffShopDetailVo> getShopDetail(@RequestBody StaffBaseGetDto staffBaseGetDto) {
+ Long userId = SecurityUtils.getUserId();
+ staffBaseGetDto.setUserId(userId);
+ StaffShopDetailVo staffShopDetailVo = shopService.getShopDetail(Long.valueOf(staffBaseGetDto.getId()));
+ return R.ok(staffShopDetailVo);
+ }
}
--
Gitblit v1.7.1