From d0b043b8fa5f19d1295cac50fece0c65fceb3920 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 17 一月 2025 17:02:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SeckillActivityInfoController.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 55 insertions(+), 2 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 c845839..382545f 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;
@@ -26,6 +27,7 @@
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
import java.util.List;
/**
@@ -51,6 +53,9 @@
@Resource
private GoodsService goodsService;
+
+ @Resource
+ private OrderClient orderClient;
@@ -63,7 +68,7 @@
@ApiOperation(value = "秒杀活动列表",tags = {"小程序-商城-首页","后台管理-活动管理-秒杀活动"})
public R<TableDataInfo> list(Goods goods)
{
- return R.ok(getDataTable(seckillActivityInfoService.listSeckillActivity(goods)));
+ return R.ok(seckillActivityInfoService.listSeckillActivity(goods));
}
/**
@@ -89,10 +94,46 @@
}
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);
}
+
+ 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"));
+ }
+
/**
@@ -128,6 +169,8 @@
}else {
record.setStatus(1); // 未开始
}
+ Integer saleNum = orderClient.getGoodsSaleNum(record.getGoodsId(), 2).getData();
+ record.setSaleNum(saleNum);
}
return R.ok(IPage);
}
@@ -143,6 +186,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