From 30ddf6570494f77a3dde98e5cd85c07cb340f51a Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 25 十一月 2024 14:42:43 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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 dbb7a06..d0df98b 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,6 +6,7 @@
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.other.enums.ShareAddType;
import com.ruoyi.other.api.domain.Share;
+import com.ruoyi.other.enums.ShareAuditStatus;
import com.ruoyi.other.service.ShareService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -33,7 +34,7 @@
/**
* 分享列表
*/
- @ApiOperation(value = "分享列表", tags = {"分享"})
+ @ApiOperation(value = "分享列表", tags = {"小程序-个人中心-门店管理-分享列表"})
@ApiImplicitParams({
@ApiImplicitParam(value = "对象id(addType=1:平台添加，addType=2:推广人添加，addType=3:门店添加)", name = "objectId", required = true, dataType = "int"),
})
@@ -47,18 +48,20 @@
/**
* 分享添加
*/
- @ApiOperation(value = "分享添加", tags = {"分享"})
+ @ApiOperation(value = "小程序-个人中心-门店管理-分享添加", tags = {"分享添加-小程序"})
@PostMapping
public AjaxResult add(@RequestBody Share share){
share.setAddType(ShareAddType.STORE.getCode());
+ share.setAuditStatus(ShareAuditStatus.WAIT.getCode());
share.setDelFlag(0);
+ share.setAppletShare(1);
return toAjax(shareService.save(share));
}
/**
* 分享删除
*/
- @ApiOperation(value = "分享删除", tags = {"分享"})
+ @ApiOperation(value = "分享删除", tags = {"小程序-个人中心-门店管理-分享删除-小程序"})
@DeleteMapping
public AjaxResult delete(@RequestBody Share share){
return toAjax(shareService.removeById(share));
@@ -67,16 +70,17 @@
/**
* 分享编辑
*/
- @ApiOperation(value = "分享编辑", tags = {"分享"})
+ @ApiOperation(value = "分享编辑", tags = {"小程序-个人中心-门店管理-分享编辑-小程序"})
@PutMapping
public AjaxResult edit(@RequestBody Share share){
+ share.setAuditStatus(ShareAuditStatus.WAIT.getCode());
return toAjax(shareService.updateById(share));
}
/**
* 分享详情
*/
- @ApiOperation(value = "分享详情", tags = {"分享"})
+ @ApiOperation(value = "分享详情", tags = {"小程序-个人中心-门店管理-分享详情-小程序"})
@GetMapping("/detail/{id}")
public AjaxResult detail(@PathVariable("id") Integer id){
return AjaxResult.success(shareService.getById(id));
--
Gitblit v1.7.1