From 41b60f3df5f3054aad44307c13a26b14f3b32ac0 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 21 十一月 2023 09:46:03 +0800
Subject: [PATCH] 11.21
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/IntroduceRewardsController.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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 0f9268d..8bb9b84 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
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.activity.entity.BodySideAppointment;
import com.dsh.activity.entity.IntroduceRewards;
+import com.dsh.activity.feignclient.account.AppUserClient;
import com.dsh.activity.feignclient.model.IntrduceOfUserRequest;
import com.dsh.activity.feignclient.model.PurchaseRecordVo;
import com.dsh.activity.feignclient.other.model.Store;
@@ -34,6 +35,7 @@
@Autowired
private IntroduceUserService introduceUserService;
+
private final SimpleDateFormat mat = new SimpleDateFormat("MM-dd HH:mm");
/**
@@ -62,6 +64,7 @@
Date date = new Date();
List<IntroduceVO> introduceVOS = idrService.listAll(query);
for (IntroduceVO introduceVO : introduceVOS) {
+
Date startTime = introduceVO.getStartTime();
Date endTime = introduceVO.getEndTime();
if (date.after(startTime) && date.before(endTime)) {
@@ -117,10 +120,18 @@
}
@PostMapping("/base/introduce/getGiftList")
- public Integer 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()));
- int sum = list.stream().mapToInt(IntroduceRewards::getGiveClass).sum();
- return sum;
+ @ResponseBody
+ public 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())
+ .orderByDesc(IntroduceRewards::getInsertTime)
+ .last("LIMIT 1"));
+ if (list.size()>0){
+ return list.get(0);
+ }
+ return null;
}
}
--
Gitblit v1.7.1