From 8cdadf81127b9d34a54d250a3abc878a8d5339c5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 06 十二月 2024 19:31:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java | 62 +++++++++++++++++++++----------
1 files changed, 42 insertions(+), 20 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 5087e0c..783f4e0 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,10 +2,11 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.other.api.domain.Share;
+import com.ruoyi.other.enums.ShareAddType;
import com.ruoyi.other.enums.ShareAuditStatus;
import com.ruoyi.other.service.ShareService;
import io.swagger.annotations.Api;
@@ -15,6 +16,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -24,66 +26,86 @@
* @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;
/**
* 分享列表
*/
- @ApiOperation(value = "分享列表", tags = {"分享"})
+ @ApiOperation(value = "分享列表", tags = {"小程序-个人中心-门店管理-分享列表"})
@ApiImplicitParams({
@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();
}
/**
* 分享删除
*/
- @ApiOperation(value = "分享删除", tags = {"分享"})
+ @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();
}
/**
* 分享编辑
*/
- @ApiOperation(value = "分享编辑", tags = {"分享"})
+ @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();
}
/**
* 分享详情
*/
- @ApiOperation(value = "分享详情", tags = {"分享"})
+ @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));
}
--
Gitblit v1.7.1