From 559ee10df3622e4802ca5664b83b713cd3a75f97 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 25 十一月 2024 11:42:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java
index 543d206..ba1e75a 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java
@@ -1,6 +1,10 @@
package com.ruoyi.other.controller;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.other.api.domain.GoodsCategory;
+import com.ruoyi.other.service.GoodsCategoryService;
+import io.swagger.annotations.ApiOperation;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.other.service.GoodsCategoryService;
import io.swagger.annotations.Api;
@@ -8,8 +12,10 @@
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -26,8 +32,18 @@
@Resource
private GoodsCategoryService goodsCategoryService;
+ @PostMapping("/index/list")
+ @ApiOperation(value = "商品分类", tags = {"小程序-首页"})
+ public R<List<GoodsCategory>> indexlist(){
+ List<GoodsCategory> indexlist = goodsCategoryService.lambdaQuery()
+ .orderByDesc(GoodsCategory::getCreateTime)
+ .last("limit 8")
+ .list()
+ ;
+ return R.ok(list);
+ }
@GetMapping("/list")
- @ApiOperation(value = "商品分类列表")
+ @ApiOperation(value = "商品分类列表", tags = {"小程序-商城-商城-首页-筛选"})
public AjaxResult list(){
return AjaxResult.success(goodsCategoryService.list());
}
--
Gitblit v1.7.1