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/SeckillActivityInfoController.java | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SeckillActivityInfoController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SeckillActivityInfoController.java
index fa4f8ff..95242a8 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SeckillActivityInfoController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SeckillActivityInfoController.java
@@ -1,8 +1,18 @@
package com.ruoyi.other.controller;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.other.api.domain.Goods;
+import com.ruoyi.other.service.SeckillActivityInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
/**
* <p>
@@ -12,9 +22,33 @@
* @author luodangjia
* @since 2024-11-20
*/
+@Api(tags = "秒杀活动信息")
@RestController
@RequestMapping("/seckill-activity-info")
-public class SeckillActivityInfoController {
+public class SeckillActivityInfoController extends BaseController {
+ @Resource
+ private SeckillActivityInfoService seckillActivityInfoService;
+
+ /**
+ * 秒杀活动列表
+ */
+ @GetMapping("/list")
+ @ApiOperation(value = "秒杀活动列表",tags = {"小程序-商城-首页-秒杀活动列表"})
+ public AjaxResult list(Goods goods)
+ {
+ startPage();
+ return AjaxResult.success(seckillActivityInfoService.listSeckillActivity(goods));
+ }
+
+ /**
+ * 秒杀活动详情
+ */
+ @GetMapping("/detail/{id}")
+ @ApiOperation(value = "秒杀活动详情", tags = {"小程序-商城-首页-秒杀活动列表-秒杀活动详情"})
+ public AjaxResult detail(@PathVariable("id") Integer id)
+ {
+ return AjaxResult.success(seckillActivityInfoService.detail(id));
+ }
}
--
Gitblit v1.7.1