From 8709268097770c9b7b046686c377d5609bb1407e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 17 一月 2025 11:38:12 +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 | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 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 57d300d..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
@@ -169,7 +169,7 @@
}else {
record.setStatus(1); // 未开始
}
- Integer saleNum = orderClient.getGoodsSaleNum(record.getGoodsId(), null).getData();
+ Integer saleNum = orderClient.getGoodsSaleNum(record.getGoodsId(), 2).getData();
record.setSaleNum(saleNum);
}
return R.ok(IPage);
@@ -186,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