From 609d91e1e62b1e8932b34b15b09baf02e7f09a93 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 09 十二月 2024 10:36:47 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 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..b6c5b53 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,15 +1,17 @@
package com.ruoyi.other.controller;
-import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.other.api.domain.GoodsCategory;
import com.ruoyi.other.service.GoodsCategoryService;
-import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -26,10 +28,20 @@
@Resource
private GoodsCategoryService goodsCategoryService;
+ @GetMapping("/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(indexlist);
+ }
@GetMapping("/list")
- @ApiOperation(value = "商品分类列表")
- public AjaxResult list(){
- return AjaxResult.success(goodsCategoryService.list());
+ @ApiOperation(value = "商品分类列表", tags = {"小程序-商城-商城-首页-筛选"})
+ public R<List<GoodsCategory>> list(){
+ return R.ok(goodsCategoryService.list());
}
}
--
Gitblit v1.7.1