From 609d91e1e62b1e8932b34b15b09baf02e7f09a93 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 09 十二月 2024 10:36:47 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java |   85 +++++++++++++++++++++++++++++++++++++++---
 1 files changed, 79 insertions(+), 6 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 8b75af1..59a5744 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
@@ -2,8 +2,10 @@
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.other.api.domain.Share;
 import com.ruoyi.other.enums.ShareAddType;
 import com.ruoyi.other.enums.ShareAuditStatus;
@@ -25,12 +27,14 @@
  * @author luodangjia
  * @since 2024-11-20
  */
-@Api("分享")
+@Api(tags = "分享")
 @RestController
 @RequestMapping("/share")
 public class ShareController extends BaseController {
     @Resource
     private ShareService shareService;
+    @Resource
+    private TokenService tokenService;
 
     /**
      * 分享列表
@@ -46,14 +50,29 @@
     }
 
 
+    @ApiOperation(value = "分享页列表", tags = {"小程序-推广中心"})
+    @GetMapping("/recommand/list")
+    public R<List<Share>> recommandlist(){
+        Long userid = tokenService.getLoginUserApplet().getUserid();
+        return R.ok(shareService.list(new LambdaQueryWrapper<Share>().eq(Share::getAddType,2)
+                .eq(Share::getObjectId, userid)));
+    }
+
+
+
     /**
      * 分享添加
      */
-    @ApiOperation(value = "小程序-个人中心-门店管理-分享添加", tags = {"分享添加-小程序"})
+    @ApiOperation(value = "分享添加", tags = {"小程序-个人中心-门店管理-分享添加"})
     @PostMapping
     public R<Void> add(@RequestBody Share share){
-        share.setAddType(ShareAddType.STORE.getCode());
-        share.setAuditStatus(ShareAuditStatus.WAIT.getCode());
+        Long userid = tokenService.getLoginUserApplet().getUserid();
+        if (share.getAddType()==1) {
+            share.setAuditStatus(ShareAuditStatus.WAIT.getCode());
+        }else if (share.getAddType()==2){
+            share.setAuditStatus(ShareAuditStatus.WAIT.getCode());
+            share.setObjectId(userid.toString());
+        }
         share.setDelFlag(0);
         share.setAppletShare(1);
         shareService.save(share);
@@ -86,11 +105,65 @@
      */
     @ApiOperation(value = "分享详情", tags = {"小程序-个人中心-门店管理-分享详情-小程序"})
     @GetMapping("/detail/{id}")
-    public R<Void> detail(@PathVariable("id") Integer id){
-        shareService.getById(id);
+    public R<Share> detail(@PathVariable("id") Integer id){
+        return R.ok(shareService.getById(id));
+    }
+
+
+    @ApiOperation(value = "添加", tags = {"后台-分享管理"})
+    @PostMapping("/manage/add")
+    public R<Void> manage(@RequestBody Share share){
+        Long userid = tokenService.getLoginUser().getUserid();
+        share.setAddType(1);
+            share.setAuditStatus(ShareAuditStatus.SUCCESS.getCode());
+            share.setObjectId(userid.toString());
+        share.setDelFlag(0);
+        shareService.save(share);
         return R.ok();
     }
 
+    @ApiOperation(value = "编辑", tags = {"后台-分享管理"})
+    @PostMapping("/manage/edit")
+    public R<Void> manageedit(@RequestBody Share share){
+
+        shareService.updateById(share);
+        return R.ok();
+    }
+
+    @ApiOperation(value = "删除", tags = {"后台-分享管理"})
+    @GetMapping("/manage/delete")
+    public R<Void> managedelete(@RequestParam Integer id){
+
+        shareService.removeById(id);
+        return R.ok();
+    }
+
+    @ApiOperation(value = "列表", tags = {"后台-分享管理"})
+    @GetMapping("/manage/list")
+    public R<Void> managelist(String name,Integer addType,@RequestParam Integer PageNum,Integer pageSize){
+
+        shareService.lambdaQuery().like(name!=null,Share::getName,name).eq(addType!=null,Share::getAddType,addType).page(Page.of(pageSize,pageSize));
+        return R.ok();
+    }
+
+    @ApiOperation(value = "设为小程序分享", tags = {"后台-分享管理"})
+    @GetMapping("/manage/set")
+    public R<Void> set(@RequestParam Integer id){
+        //将所有分享设为不是小程序分享
+        List<Share> list = shareService.lambdaQuery().list();
+        if (!list.isEmpty()){
+            for (Share share : list) {
+                
+            }
+        }
+        //设置小程序分享
+        return R.ok();
+    }
+
+
+
+
+
 
 
 

--
Gitblit v1.7.1