java/qijisheng.git

			@@ -4,7 +4,6 @@
			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.common.core.web.page.TableDataInfo;
			import com.ruoyi.other.api.domain.Goods;
			import com.ruoyi.other.service.GoodsService;
			@@ -37,9 +36,9 @@
			*/
			@GetMapping("/goodsList")
			@ApiOperation(value = "商品列表", tags = {"小程序-商城-首页-热门商品列表", "首页热门商品-小程序"})
			public TableDataInfo goodsList(Goods goods){
			public R<TableDataInfo> goodsList(Goods goods){
			startPage();
			return getDataTable(goodsService.goodsList(goods));
			return R.ok(getDataTable(goodsService.goodsList(goods)));
			}


			@@ -48,10 +47,9 @@
			*/
			@GetMapping("/getGoodsListByShopId")
			@ApiOperation(value = "商品列表", tags = {"小程序-首页-门店详情-商品购买列表"})
			public TableDataInfo getGoodsListByShopId(@ApiParam("门店id") @RequestParam Integer shopId) {
			public R<TableDataInfo> getGoodsListByShopId(@ApiParam("门店id") @RequestParam Integer shopId) {
			startPage();
			List<Goods> goods = goodsService.getGoodsListByShopId(shopId);
			return getDataTable(goods);
			return R.ok(getDataTable(goodsService.getGoodsListByShopId(shopId)));
			}


			@@ -77,5 +75,25 @@
			return R.ok(list);
			}


			/**
			* 根据id获取商品信息
			* @param id
			* @return
			*/
			@ResponseBody
			@PostMapping("/getGoodsById")
			public R<Goods> getGoodsById(@RequestParam("id") Integer id){
			Goods goods = goodsService.getById(id);
			return R.ok(goods);
			}

			@ResponseBody
			@PostMapping("/getGoodsByIds")
			public R<List<Goods>> getGoodsByIds(@RequestParam("ids") String [] ids){
			List<Goods> goods = goodsService.lambdaQuery().in(Goods::getId, ids).eq(Goods::getStatus, 0).list();
			return R.ok(goods);
			}

			}