From 441e9b38477832f312b23b840a8af3464e89b663 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 16 一月 2025 16:03:42 +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/SeckillActivityInfoController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 68af785..92acd9e 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
@@ -63,8 +63,7 @@
@ApiOperation(value = "秒杀活动列表",tags = {"小程序-商城-首页","后台管理-活动管理-秒杀活动"})
public R<TableDataInfo> list(Goods goods)
{
- TableDataInfo<SeckillActivityVO> dataTable = getDataTable(seckillActivityInfoService.listSeckillActivity(goods));
- return R.ok(dataTable);
+ return R.ok(seckillActivityInfoService.listSeckillActivity(goods));
}
/**
@@ -90,12 +89,17 @@
}
GoodsSeckill goodsSeckill = goodsSeckillService.getOne(new LambdaQueryWrapper<GoodsSeckill>().eq(GoodsSeckill::getSeckillActivityInfoId, one.getId()).eq(GoodsSeckill::getVip, info.getVip()));
if(null != goodsSeckill){
- goodsSeckill.setEndTime(one.getEndTime().toEpochSecond(ZoneOffset.UTC) * 1000);
+ LocalDateTime endTime = one.getEndTime();
+// // 转时间戳
+ long timeStamp = endTime.toInstant(ZoneOffset.of("+8")).toEpochMilli();
+ goodsSeckill.setEndTime(timeStamp);
}
return R.ok(goodsSeckill);
}
+
+
/**
* 获取商品秒杀活动
* @param id
--
Gitblit v1.7.1