From b8a9b64f2b5d2ec7607b03274e547a1a0bca3236 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期四, 12 十二月 2024 09:44:45 +0800
Subject: [PATCH] 1.后台管理-评论 2.后台管理-门店特殊价

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java |   37 ++++++++++++++++++++++---------------
 1 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java
index 913d2b3..7683539 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java
@@ -6,10 +6,12 @@
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.other.api.domain.Share;
 import com.ruoyi.other.enums.ShareAddType;
 import com.ruoyi.other.enums.ShareAuditStatus;
 import com.ruoyi.other.service.ShareService;
+import com.ruoyi.system.api.model.LoginUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -27,7 +29,7 @@
  * @author luodangjia
  * @since 2024-11-20
  */
-@Api(tags = "分享")
+@Api("分享")
 @RestController
 @RequestMapping("/share")
 public class ShareController extends BaseController {
@@ -39,7 +41,7 @@
     /**
      * 分享列表
      */
-    @ApiOperation(value = "分享列表", tags = {"小程序-个人中心-门店管理-分享列表"})
+    @ApiOperation(value = "分享列表", tags = {"小程序-个人中心-门店管理"})
     @ApiImplicitParams({
             @ApiImplicitParam(value = "对象id(addType=1:平台添加,addType=2:推广人添加,addType=3:门店添加)", name = "objectId", required = true, dataType = "int"),
     })
@@ -63,7 +65,7 @@
     /**
      * 分享添加
      */
-    @ApiOperation(value = "分享添加", tags = {"小程序-个人中心-门店管理-分享添加"})
+    @ApiOperation(value = "分享添加", tags = {"小程序-个人中心-门店管理"})
     @PostMapping
     public R<Void> add(@RequestBody Share share){
         Long userid = tokenService.getLoginUserApplet().getUserid();
@@ -82,7 +84,7 @@
     /**
      * 分享删除
      */
-    @ApiOperation(value = "分享删除", tags = {"小程序-个人中心-门店管理-分享删除-小程序"})
+    @ApiOperation(value = "分享删除", tags = {"小程序-个人中心-门店管理"})
     @DeleteMapping
     public R<Void> delete(@RequestBody Share share){
         shareService.removeById(share);
@@ -92,7 +94,7 @@
     /**
      * 分享编辑
      */
-    @ApiOperation(value = "分享编辑", tags = {"小程序-个人中心-门店管理-分享编辑-小程序"})
+    @ApiOperation(value = "分享编辑", tags = {"小程序-个人中心-门店管理"})
     @PutMapping
      public R<Void> edit(@RequestBody Share share){
         share.setAuditStatus(ShareAuditStatus.WAIT.getCode());
@@ -103,17 +105,18 @@
     /**
      * 分享详情
      */
-    @ApiOperation(value = "分享详情", tags = {"小程序-个人中心-门店管理-分享详情-小程序"})
+    @ApiOperation(value = "分享详情", tags = {"小程序-个人中心-门店管理"})
     @GetMapping("/detail/{id}")
     public R<Share> detail(@PathVariable("id") Integer id){
         return R.ok(shareService.getById(id));
     }
 
 
-    @ApiOperation(value = "添加", tags = {"后台-分享管理"})
+    @ApiOperation(value = "广告管理-分享管理-添加", tags = {"管理后台"})
     @PostMapping("/manage/add")
     public R<Void> manage(@RequestBody Share share){
-        Long userid = tokenService.getLoginUser().getUserid();
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        Long userid = loginUser.getSysUser().getUserId();
         share.setAddType(1);
             share.setAuditStatus(ShareAuditStatus.SUCCESS.getCode());
             share.setObjectId(userid.toString());
@@ -122,7 +125,7 @@
         return R.ok();
     }
 
-    @ApiOperation(value = "编辑", tags = {"后台-分享管理"})
+    @ApiOperation(value = "广告管理-分享管理-编辑", tags = {"管理后台"})
     @PostMapping("/manage/edit")
     public R<Void> manageedit(@RequestBody Share share){
 
@@ -130,7 +133,7 @@
         return R.ok();
     }
 
-    @ApiOperation(value = "删除", tags = {"后台-分享管理"})
+    @ApiOperation(value = "广告管理-分享管理-删除", tags = {"管理后台"})
     @GetMapping("/manage/delete")
     public R<Void> managedelete(@RequestParam Integer id){
 
@@ -138,14 +141,14 @@
         return R.ok();
     }
 
-    @ApiOperation(value = "列表", tags = {"后台-分享管理"})
+    @ApiOperation(value = "广告管理-分享管理-列表", tags = {"管理后台"})
     @GetMapping("/manage/list")
     public R<Page<Share>> managelist(String name,Integer addType,@RequestParam Integer PageNum,Integer pageSize){
-        Page<Share> page = shareService.lambdaQuery().like(name != null, Share::getName, name).eq(addType != null, Share::getAddType, addType).page(Page.of(pageSize, pageSize));
+        Page<Share> page = shareService.lambdaQuery().eq(Share::getAuditStatus,1).like(name != null, Share::getName, name).eq(addType != null, Share::getAddType, addType).page(Page.of(pageSize, pageSize));
         return R.ok(page);
     }
 
-    @ApiOperation(value = "设为小程序分享", tags = {"后台-分享管理"})
+    @ApiOperation(value = "广告管理-分享管理-设为小程序分享", tags = {"管理后台"})
     @GetMapping("/manage/set")
     public R<Void> set(@RequestParam Integer id){
         //将所有分享设为不是小程序分享
@@ -164,8 +167,12 @@
     }
 
 
-
-
+    @ApiOperation(value = "广告管理-分享管理-审核列表", tags = {"管理后台"})
+    @GetMapping("/manage/auth/list")
+    public R<Page<Share>> authmanagelist(String name,Integer addType,@RequestParam Integer PageNum,Integer pageSize){
+        Page<Share> page = shareService.lambdaQuery().ne(Share::getAuditStatus,1).like(name != null, Share::getName, name).eq(addType != null, Share::getAddType, addType).page(Page.of(pageSize, pageSize));
+        return R.ok(page);
+    }
 
 
 

--
Gitblit v1.7.1