Merge remote-tracking branch 'origin/master'

luodangjia

2024-11-28 06f455915bb9d11caa8829942f9007809ee9ae3d

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java

@@ -2,10 +2,10 @@


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.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 +15,7 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;

/**
 * <p>
@@ -24,7 +25,7 @@
 * @author luodangjia
 * @since 2024-11-20
 */
@Api("分享")
@Api(tags = "分享")
@RestController
@RequestMapping("/share")
public class ShareController extends BaseController {
@@ -39,8 +40,8 @@
            @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)));
    }

@@ -48,14 +49,15 @@
    /**
     * 分享添加
     */
    @ApiOperation(value = "小程序-个人中心-门店管理-分享添加", tags = {"分享添加-小程序"})
    @ApiOperation(value = "分享添加", tags = {"小程序-个人中心-门店管理-分享添加"})
    @PostMapping
    public AjaxResult add(@RequestBody Share share){
    public R<Void> 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));
        shareService.save(share);
        return R.ok();
    }

    /**
@@ -63,8 +65,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 +75,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,8 +86,8 @@
     */
    @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));
    }