From f6ba3e15355e22767e69f8fc14ae22523f8db8dc Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 22 十一月 2023 19:33:58 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/IntroduceRewardsController.java | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 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..808d160 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)) {
@@ -81,7 +84,25 @@
@RequestMapping("/base/introduce/addIntroduce")
public Object addIntroduce(@RequestBody IntroduceRewards introduceRewards){
+
if (introduceRewards.getId()!=null){
+ IntroduceRewards byId = idrService.getById(introduceRewards.getId());
+ // 判断当前活动有没有开始 如果开始了不能编辑赠送课时数 不能编辑活动开始时间
+ Date endTime = byId.getEndTime();
+ Date startTime = byId.getStartTime();
+ Date local = new Date();
+ if (startTime.before(local)&&endTime.after(local)){
+ // 证明当前活动已开始
+ // 判断有没有修改开始时间
+ if (!introduceRewards.getStartTime().equals(byId.getStartTime())){
+ // 表示不能修改开始时间
+ return 5002;
+ }
+ if (!introduceRewards.getGiveClass().equals(byId.getGiveClass())){
+ // 表示不能修改赠送课时数
+ return 5001;
+ }
+ }
return idrService.updateById(introduceRewards);
}else {
introduceRewards.setInsertTime(new Date());
@@ -117,10 +138,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