From 103cb3dbd9df9a32565d718b782edcb1b0fdf51c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 16 一月 2025 19:44:59 +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 | 63 ++++++++++++++++++++++++++-----
1 files changed, 53 insertions(+), 10 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 aedad5c..57d300d 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,8 +68,7 @@
@ApiOperation(value = "秒杀活动列表",tags = {"小程序-商城-首页","后台管理-活动管理-秒杀活动"})
public R<TableDataInfo> list(Goods goods)
{
- startPage();
- return R.ok(getDataTable(seckillActivityInfoService.listSeckillActivity(goods)));
+ return R.ok(seckillActivityInfoService.listSeckillActivity(goods));
}
/**
@@ -72,9 +76,9 @@
*/
@GetMapping("/detail/{id}")
@ApiOperation(value = "秒杀活动详情", tags = {"小程序-商城-首页"})
- public R<SeckillActivityDetailVO> detail(@PathVariable("id") Integer id)
+ public R<SeckillActivityDetailVO> detail(@PathVariable("id") Integer id, String latitude, String longitude)
{
- return R.ok(seckillActivityInfoService.detail(id));
+ return R.ok(seckillActivityInfoService.detail(id, latitude, longitude));
}
@@ -84,16 +88,52 @@
@PostMapping("/getSeckillActivityInfo")
public R<GoodsSeckill> getSeckillActivityInfo(@RequestBody GetSeckillActivityInfo info){
SeckillActivityInfo one = seckillActivityInfoService.getOne(new LambdaQueryWrapper<SeckillActivityInfo>().eq(SeckillActivityInfo::getGoodId, info.getGoodsId())
- .eq(SeckillActivityInfo::getDelFlag, 0).last(" and now() between start_time and end_time order by create_time limit 0,1"));
+ .eq(SeckillActivityInfo::getDelFlag, 0).eq(SeckillActivityInfo::getIsShelves, 1).last(" and now() between start_time and end_time order by create_time limit 0,1"));
if(null == one){
return R.ok();
}
- GoodsSeckill goodsSeckill = goodsSeckillService.getOne(new LambdaQueryWrapper<GoodsSeckill>().eq(GoodsSeckill::getSeckillActivityInfoId, one.getGoodId()).eq(GoodsSeckill::getVip, info.getVip()));
+ 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"));
+ }
+
/**
@@ -129,6 +169,8 @@
}else {
record.setStatus(1); // 未开始
}
+ Integer saleNum = orderClient.getGoodsSaleNum(record.getGoodsId(), null).getData();
+ record.setSaleNum(saleNum);
}
return R.ok(IPage);
}
@@ -195,8 +237,9 @@
.set(SeckillActivityInfo::getIsShelves, seckillActivityVO.getShowStatus()));
return R.ok();
}
-
-
-
+
+
+
+
}
--
Gitblit v1.7.1