'两个装修类合并'

GokuAtsu · Nov 14, 2022 · e244883 · e244883
1 parent 92367c9
commit e244883
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 120 deletions.
diff --git a/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java b/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java
@@ -98,8 +98,8 @@ public PageData updatePageData(PageData pageData) {
             LambdaUpdateWrapper<PageData> lambdaUpdateWrapper = Wrappers.lambdaUpdate();
             lambdaUpdateWrapper.eq(CharSequenceUtil.isNotEmpty(pageData.getPageType()), PageData::getPageType, pageData.getPageType());
             lambdaUpdateWrapper.eq(CharSequenceUtil.isNotEmpty(pageData.getPageClientType()), PageData::getPageClientType, pageData.getPageClientType());
+            lambdaUpdateWrapper.eq(PageData::getNum, pageData.getNum());
             lambdaUpdateWrapper.set(PageData::getPageShow, SwitchEnum.CLOSE.name());
-            lambdaUpdateWrapper.set(PageData::getNum, pageData.getNum());
             lambdaUpdateWrapper.set(StrUtil.isNotEmpty(pageData.getNum()), PageData::getNum, SwitchEnum.CLOSE.name());
             this.update(lambdaUpdateWrapper);
         } else {

diff --git a/...roller/other/PageDataStoreController.java → ...ler/settings/PageDataStoreController.java b/...roller/other/PageDataStoreController.java → ...ler/settings/PageDataStoreController.java
@@ -1,7 +1,9 @@
-package cn.lili.controller.other;
+package cn.lili.controller.settings;
 
 import cn.lili.common.aop.annotation.DemoSite;
+import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
+import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
@@ -21,6 +23,7 @@
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
+import java.util.Objects;
 
 /**
  * 店铺端,页面设置管理接口
@@ -30,12 +33,23 @@
  */
 @RestController
 @Api(tags = "店铺端,页面设置管理接口")
-@RequestMapping("/store/other/pageData")
+@RequestMapping("/store/settings/pageData")
 public class PageDataStoreController {
 
     @Autowired
     private PageDataService pageDataService;
 
+    @ApiOperation(value = "页面列表")
+    @ApiImplicitParam(name = "pageClientType", value = "客户端类型", required = true, dataType = "String", paramType = "path")
+    @GetMapping("/{pageClientType}/pageDataList")
+    public ResultMessage<IPage<PageDataListVO>> pageDataList(@PathVariable String pageClientType, PageVO pageVO) {
+        String storeId = Objects.requireNonNull(UserContext.getCurrentUser()).getStoreId();
+        PageDataDTO pageDataDTO = new PageDataDTO();
+        pageDataDTO.setPageType(PageEnum.STORE.name());
+        pageDataDTO.setPageClientType(pageClientType);
+        pageDataDTO.setNum(storeId);
+        return ResultUtil.data(pageDataService.getPageDataList(pageVO, pageDataDTO));
+    }
     @ApiOperation(value = "获取页面信息")
     @ApiImplicitParam(name = "id", value = "页面ID", required = true, dataType = "String", paramType = "path")
     @GetMapping(value = "/{id}")
@@ -50,7 +64,7 @@ public ResultMessage<PageData> getPageData(@PathVariable String id) {
     }
 
     @ApiOperation(value = "添加页面")
-    @PostMapping("/add")
+    @PostMapping("/save")
     public ResultMessage<PageData> addPageData(@Valid PageData pageData) {
         //添加店铺类型，填写店铺ID
         pageData.setPageType(PageEnum.STORE.name());
@@ -65,34 +79,45 @@ public ResultMessage<PageData> addPageData(@Valid PageData pageData) {
     @DemoSite
     @PutMapping("/update/{id}")
     public ResultMessage<PageData> updatePageData(@Valid PageData pageData, @NotNull @PathVariable String id) {
+
+        this.checkAuthority(id);
         pageData.setId(id);
         //添加店铺类型，填写店铺ID
         pageData.setPageType(PageEnum.STORE.name());
         pageData.setNum(UserContext.getCurrentUser().getStoreId());
         return ResultUtil.data(pageDataService.updatePageData(pageData));
     }
 
-    @ApiOperation(value = "页面列表")
-    @GetMapping("/pageDataList")
-    public ResultMessage<IPage<PageDataListVO>> pageDataList(PageVO pageVO, PageDataDTO pageDataDTO) {
-        pageDataDTO.setPageType(PageEnum.STORE.name());
-        pageDataDTO.setNum(UserContext.getCurrentUser().getStoreId());
-        return ResultUtil.data(pageDataService.getPageDataList(pageVO, pageDataDTO));
-    }
 
     @ApiOperation(value = "发布页面")
     @ApiImplicitParam(name = "id", value = "页面ID", required = true, dataType = "String", paramType = "path")
     @PutMapping("/release/{id}")
     @DemoSite
     public ResultMessage<PageData> release(@PathVariable String id) {
+        this.checkAuthority(id);
         return ResultUtil.data(pageDataService.releasePageData(id));
     }
 
     @ApiOperation(value = "删除页面")
     @DemoSite
     @ApiImplicitParam(name = "id", value = "页面ID", required = true, dataType = "String", paramType = "path")
-    @DeleteMapping("/remove/{id}")
+    @DeleteMapping("/removePageData/{id}")
     public ResultMessage<Object> remove(@PathVariable String id) {
+        this.checkAuthority(id);
         return ResultUtil.data(pageDataService.removePageData(id));
     }
+
+
+    /**
+     * 店铺权限判定
+     * @param id
+     */
+    private void checkAuthority(String id) {
+        String storeId = Objects.requireNonNull(UserContext.getCurrentUser()).getStoreId();
+        LambdaQueryWrapper<PageData> queryWrapper = new LambdaQueryWrapper<PageData>().eq(PageData::getId, id).eq(PageData::getPageType, PageEnum.STORE.name()).eq(PageData::getNum, storeId);
+        PageData data = pageDataService.getOne(queryWrapper);
+        if (data == null) {
+            throw new ServiceException(ResultCode.USER_AUTHORITY_ERROR);
+        }
+    }
 }
diff --git a/seller-api/src/main/java/cn/lili/controller/settings/StorePageDataController.java b/seller-api/src/main/java/cn/lili/controller/settings/StorePageDataController.java