From 1b8ad0cc6a79f84fb32fdffae39742afa964748e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 24 九月 2024 16:09:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/IntroduceRewardsController.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/IntroduceRewardsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/IntroduceRewardsController.java
index 96fa6a2..d7573c9 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/IntroduceRewardsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/IntroduceRewardsController.java
@@ -147,17 +147,15 @@
@PostMapping("/base/introduce/getGiftList")
@ResponseBody
- public IntroduceRewards getGiftList(@RequestBody String cityCode) {
+ public List<IntroduceRewards> getGiftList(@RequestBody String cityCode) {
List<IntroduceRewards> list = idrService.list(new LambdaQueryWrapper<IntroduceRewards>()
.eq(IntroduceRewards::getCityCode, cityCode)
.le(IntroduceRewards::getStartTime, new Date())
.ge(IntroduceRewards::getEndTime, new Date())
+ .eq(IntroduceRewards::getState, 1)
.orderByDesc(IntroduceRewards::getInsertTime)
- .last("LIMIT 1"));
- if (list.size() > 0) {
- return list.get(0);
- }
- return null;
+ );
+ return list;
}
}
--
Gitblit v1.7.1