岐济生
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
phpcjl
2024-11-25 1364b5595d2d9d0cfe0bb5c1f0eb825679b7561a 
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java


@@ -1,19 +1,20 @@


package com.ruoyi.other.controller;






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.common.core.web.page.TableDataInfo;


import com.ruoyi.other.api.domain.Goods;


import com.ruoyi.other.service.GoodsService;


import com.ruoyi.other.vo.GoodsVO;


import io.swagger.annotations.Api;


import io.swagger.annotations.ApiOperation;


import org.springframework.web.bind.annotation.GetMapping;


import org.springframework.web.bind.annotation.PathVariable;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.RestController;


import io.swagger.annotations.ApiParam;


import org.springframework.web.bind.annotation.*;




import javax.annotation.Resource;


import java.util.List;




/**


 * <p>


@@ -40,13 +41,26 @@


        return getDataTable(goodsService.goodsList(goods));


    }






    /**


     * 指定门店商品


     */


    @GetMapping("/getGoodsListByShopId")


    @ApiOperation(value = "商品列表", tags = {"小程序-首页-门店详情-商品购买列表"})


    public TableDataInfo getGoodsListByShopId(@ApiParam("门店id") @RequestParam Integer shopId) {


        startPage();


        List<Goods> goods = goodsService.getGoodsListByShopId(shopId);


        return getDataTable(goods);


    }






    /**


     * 商品详情


     */


    @GetMapping("/goodsDetail/{goodsId}")


    @ApiOperation(value = "商品详情", tags = {"小程序-商城-首页-商品详情"})


    public AjaxResult goodsDetail(@PathVariable("goodsId") Long goodsId){


        return success(goodsService.goodsDetail(goodsId));


    public R<GoodsVO> goodsDetail(@PathVariable("goodsId") Long goodsId){


        return R.ok(goodsService.goodsDetail(goodsId));


    }