From c90a8ac772937f8f084356ea1f04c5dba1d9e5d5 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 24 一月 2025 11:15:33 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SeckillActivityInfoController.java | 51 +++++++++++++++++++--------------------------------
1 files changed, 19 insertions(+), 32 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 d85091e..0780b0f 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
@@ -8,6 +8,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.order.feignClient.OrderClient;
import com.ruoyi.other.api.domain.Goods;
import com.ruoyi.other.api.domain.GoodsSeckill;
import com.ruoyi.other.api.domain.SeckillActivityInfo;
@@ -52,6 +53,9 @@
@Resource
private GoodsService goodsService;
+
+ @Resource
+ private OrderClient orderClient;
@@ -61,7 +65,7 @@
* 秒杀活动列表
*/
@GetMapping("/list")
- @ApiOperation(value = "秒杀活动列表",tags = {"小程序-商城-首页","后台管理-活动管理-秒杀活动"})
+ @ApiOperation(value = "秒杀活动列表",tags = {"小程序-商城-首页"})
public R<TableDataInfo> list(Goods goods)
{
return R.ok(seckillActivityInfoService.listSeckillActivity(goods));
@@ -98,37 +102,8 @@
return R.ok(goodsSeckill);
}
- public static void main(String[] args) {
- // 创建 LocalDateTime 对象
- LocalDateTime localDateTime = LocalDateTime.of(2025, 1, 16, 9, 34, 55);
- // 转换为 UTC 时间戳（毫秒）
- long l = localDateTime.toEpochSecond(ZoneOffset.UTC) * 1000;
- System.out.println("UTC 时间戳: " + l);
-
- // 转换为 UTC+8 时间戳（毫秒）
- long l2 = localDateTime.toInstant(ZoneOffset.of("+8")).toEpochMilli();
- System.out.println("UTC+8 时间戳: " + l2);
-
- // 将时间戳转换为 yyyy-MM-dd HH:mm:ss 格式的字符串
- String utcTime = formatTimestamp(l, ZoneOffset.UTC);
- String utcPlus8Time = formatTimestamp(l2, ZoneOffset.of("+8"));
-
- System.out.println("UTC 时间: " + utcTime);
- System.out.println("UTC+8 时间: " + utcPlus8Time);
- }
-
- /**
- * 将时间戳转换为指定时区的 yyyy-MM-dd HH:mm:ss 格式字符串
- *
- * @param timestamp 时间戳（毫秒）
- * @param zoneOffset 时区偏移量
- * @return 格式化后的时间字符串
- */
- private static String formatTimestamp(long timestamp, ZoneOffset zoneOffset) {
- return LocalDateTime.ofEpochSecond(timestamp / 1000, 0, zoneOffset)
- .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
- }
+
@@ -148,7 +123,7 @@
* 秒杀活动列表
*/
@GetMapping("/manageList")
- @ApiOperation(value = "秒杀活动列表",tags = {"小程序-商城-首页","后台管理-活动管理-秒杀活动"})
+ @ApiOperation(value = "秒杀活动列表",tags = {"后台管理-活动管理-秒杀活动"})
public R<IPage<SeckillActivityVO>> manageList(@ApiParam("页码") @RequestParam Integer pageNum,
@ApiParam("每一页数据大小") Integer pageSize,
Goods goods)
@@ -165,6 +140,8 @@
}else {
record.setStatus(1); // 未开始
}
+ Integer saleNum = orderClient.getGoodsSaleNum(record.getGoodsId(), 2).getData();
+ record.setSaleNum(saleNum);
}
return R.ok(IPage);
}
@@ -180,6 +157,16 @@
return R.ok();
}
+ @GetMapping("/getSeckillActivityInfoByGoodsId")
+ public R<SeckillActivityInfo> getSeckillActivityInfoByGoodsId(@RequestParam("goodsId") Integer goodsId){
+ SeckillActivityInfo seckillActivityInfo = seckillActivityInfoService.getOne(new LambdaQueryWrapper<SeckillActivityInfo>()
+ .eq(SeckillActivityInfo::getGoodId, goodsId)
+ .eq(SeckillActivityInfo::getDelFlag, 0)
+ .eq(SeckillActivityInfo::getIsShelves, 1)
+ .last(" and now() between start_time and end_time"));
+ return R.ok(seckillActivityInfo);
+ }
+
/**
* 修改秒杀活动
*/
--
Gitblit v1.7.1