From 3c9cc4f7a8ce14ce07dec4032d163fbb654cbd3f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 14 一月 2025 19:08:04 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SeckillActivityInfoController.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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..5e750ee 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
@@ -72,9 +72,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,11 +84,11 @@
@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);
}
@@ -195,8 +195,9 @@
.set(SeckillActivityInfo::getIsShelves, seckillActivityVO.getShowStatus()));
return R.ok();
}
-
-
-
+
+
+
+
}
--
Gitblit v1.7.1