java/qijisheng.git

			@@ -1,9 +1,20 @@
			package com.ruoyi.other.controller;


			import org.springframework.web.bind.annotation.RequestMapping;
			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 io.swagger.annotations.ApiParam;
			import org.springframework.web.bind.annotation.*;

			import org.springframework.web.bind.annotation.RestController;
			import javax.annotation.Resource;
			import java.util.List;

			/**
			* <p>
			@@ -15,7 +26,46 @@
			*/
			@RestController
			@RequestMapping("/goods")
			public class GoodsController {
			@Api("商品")
			public class GoodsController extends BaseController {
			@Resource
			private GoodsService goodsService;

			/**
			* 商品列表
			*/
			@GetMapping("/goodsList")
			@ApiOperation(value = "商品列表", tags = {"小程序-商城-首页-热门商品列表", "首页热门商品-小程序"})
			public TableDataInfo goodsList(Goods goods){
			startPage();
			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 R<GoodsVO> goodsDetail(@PathVariable("goodsId") Long goodsId){
			return R.ok(goodsService.goodsDetail(goodsId));
			}





			}