From b4c77c0839258280044cf65a15471fa3c20d465f Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 21 十一月 2023 09:12:38 +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 | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 53 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 362632e..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,16 +5,19 @@
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;
import com.dsh.activity.model.*;
import com.dsh.activity.service.IntroduceRewardsService;
+import com.dsh.activity.service.IntroduceUserService;
import io.swagger.annotations.Api;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.text.Format;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -29,16 +32,50 @@
@Autowired
private IntroduceRewardsService idrService;
+ @Autowired
+ private IntroduceUserService introduceUserService;
+
private final SimpleDateFormat mat = new SimpleDateFormat("MM-dd HH:mm");
+
/**
- * 获取所有体测预约记录
+ * 获取介绍有礼-参与用户记录表
+ * @return
+ */
+ @RequestMapping("/base/introduceUser/listAllUser")
+ public List<IntroduceUser> listAllUser(@RequestBody IntroduceUserQuery query){
+ return introduceUserService.listAll(query);
+ }
+ /**
+ * 通过id获取介绍有礼
+ * @return
+ */
+ @RequestMapping("/base/introduce/getInfoById")
+ public IntroduceRewards getInfoById(@RequestBody Integer id){
+ return idrService.getById(id);
+
+ }
+ /**
+ * 获取介绍有礼记录表
* @return
*/
@RequestMapping("/base/introduce/listAll")
public List<IntroduceVO> listAll(@RequestBody IntroduceQuery query){
+ Date date = new Date();
+ List<IntroduceVO> introduceVOS = idrService.listAll(query);
+ for (IntroduceVO introduceVO : introduceVOS) {
- return null;
+ Date startTime = introduceVO.getStartTime();
+ Date endTime = introduceVO.getEndTime();
+ if (date.after(startTime) && date.before(endTime)) {
+ introduceVO.setActivityState(1);
+ } else if (date.before(startTime)) {
+ introduceVO.setActivityState(2);
+ } else if (date.after(endTime)) {
+ introduceVO.setActivityState(3);
+ }
+ }
+ return introduceVOS;
}
/**
* 增加/修改介绍有礼记录
@@ -46,9 +83,11 @@
*/
@RequestMapping("/base/introduce/addIntroduce")
public Object addIntroduce(@RequestBody IntroduceRewards introduceRewards){
+
if (introduceRewards.getId()!=null){
return idrService.updateById(introduceRewards);
}else {
+ introduceRewards.setInsertTime(new Date());
return idrService.save(introduceRewards);
}
}
@@ -81,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).ge(IntroduceRewards::getStartTime,new Date()).le(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