From 131a0d2dfa1061811567deed40b1036204703b8d Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 29 十一月 2024 14:02:27 +0800
Subject: [PATCH] 11.29
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java
index b414fac..aabd51b 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java
@@ -1,10 +1,9 @@
package com.ruoyi.other.controller;
+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;
import com.ruoyi.other.vo.GoodsVO;
@@ -36,9 +35,9 @@
*/
@GetMapping("/goodsList")
@ApiOperation(value = "商品列表", tags = {"小程序-商城-首页-热门商品列表", "首页热门商品-小程序"})
- public TableDataInfo goodsList(Goods goods){
+ public R<List<GoodsVO>> goodsList(Goods goods){
startPage();
- return getDataTable(goodsService.goodsList(goods));
+ return R.ok(goodsService.goodsList(goods));
}
@@ -47,10 +46,9 @@
*/
@GetMapping("/getGoodsListByShopId")
@ApiOperation(value = "商品列表", tags = {"小程序-首页-门店详情-商品购买列表"})
- public TableDataInfo getGoodsListByShopId(@ApiParam("门店id") @RequestParam Integer shopId) {
+ public R<List<Goods>> getGoodsListByShopId(@ApiParam("门店id") @RequestParam Integer shopId) {
startPage();
- List<Goods> goods = goodsService.getGoodsListByShopId(shopId);
- return getDataTable(goods);
+ return R.ok(goodsService.getGoodsListByShopId(shopId));
}
@@ -62,10 +60,19 @@
public R<GoodsVO> goodsDetail(@PathVariable("goodsId") Long goodsId){
return R.ok(goodsService.goodsDetail(goodsId));
}
-
-
+ /**
+ * 根据类型（1=服务商品，2=单品商品）获取商品数据
+ * @param type
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/getGoodsByType")
+ public R<List<Goods>> getGoodsByType(@RequestParam("type") Integer type){
+ List<Goods> list = goodsService.list(new LambdaQueryWrapper<Goods>().eq(Goods::getType, type).eq(Goods::getDelFlag, 0).eq(Goods::getStatus, 2));
+ return R.ok(list);
+ }
}
--
Gitblit v1.7.1