From a17335c7cddc86ffe70d423e7e6e7456b1d6c93a Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期二, 10 十二月 2024 15:15:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java | 122 +++++++++++++++++++++++++++++++++++-----
1 files changed, 107 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 14001fc..067517f 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,12 +2,16 @@
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.core.web.domain.AjaxResult;
-import com.ruoyi.other.enums.ShareAddType;
+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;
@@ -15,6 +19,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -30,6 +35,8 @@
public class ShareController extends BaseController {
@Resource
private ShareService shareService;
+ @Resource
+ private TokenService tokenService;
/**
* 分享列表
@@ -39,23 +46,39 @@
@ApiImplicitParam(value = "对象id(addType=1:平台添加，addType=2:推广人添加，addType=3:门店添加)", name = "objectId", required = true, dataType = "int"),
})
@GetMapping("/list")
- public AjaxResult list(@RequestParam Integer objectId){
- return AjaxResult.success(shareService.list(new LambdaQueryWrapper<Share>()
+ public R<List<Share>> list(@RequestParam Integer objectId){
+ return R.ok(shareService.list(new LambdaQueryWrapper<Share>()
.eq(Share::getObjectId, objectId)));
}
+
+
+ @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 AjaxResult add(@RequestBody Share share){
- share.setAddType(ShareAddType.STORE.getCode());
- share.setAuditStatus(ShareAuditStatus.WAIT.getCode());
+ public R<Void> add(@RequestBody Share share){
+ 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);
- return toAjax(shareService.save(share));
+ shareService.save(share);
+ return R.ok();
}
/**
@@ -63,8 +86,9 @@
*/
@ApiOperation(value = "分享删除", tags = {"小程序-个人中心-门店管理-分享删除-小程序"})
@DeleteMapping
- public AjaxResult delete(@RequestBody Share share){
- return toAjax(shareService.removeById(share));
+ public R<Void> delete(@RequestBody Share share){
+ shareService.removeById(share);
+ return R.ok();
}
/**
@@ -72,9 +96,10 @@
*/
@ApiOperation(value = "分享编辑", tags = {"小程序-个人中心-门店管理-分享编辑-小程序"})
@PutMapping
- public AjaxResult edit(@RequestBody Share share){
+ public R<Void> edit(@RequestBody Share share){
share.setAuditStatus(ShareAuditStatus.WAIT.getCode());
- return toAjax(shareService.updateById(share));
+ shareService.updateById(share);
+ return R.ok();
}
/**
@@ -82,11 +107,78 @@
*/
@ApiOperation(value = "分享详情", tags = {"小程序-个人中心-门店管理-分享详情-小程序"})
@GetMapping("/detail/{id}")
- public AjaxResult detail(@PathVariable("id") Integer id){
- return AjaxResult.success(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){
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ Long userid = loginUser.getSysUser().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<Page<Share>> managelist(String name,Integer addType,@RequestParam Integer PageNum,Integer 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 = {"后台-分享管理"})
+ @GetMapping("/manage/set")
+ public R<Void> set(@RequestParam Integer id){
+ //将所有分享设为不是小程序分享
+ List<Share> list = shareService.lambdaQuery().list();
+ if (!list.isEmpty()){
+ for (Share share : list) {
+ share.setAppletShare(0);
+ }
+ shareService.updateBatchById(list);
+ }
+ //设置小程序分享
+ Share byId = shareService.getById(id);
+ byId.setAppletShare(1);
+ shareService.updateById(byId);
+ return R.ok();
+ }
+
+
+ @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