From 1aa309700fb7e12d85f98bed22a45bdac448ec1c Mon Sep 17 00:00:00 2001 From: liujie <liujie> Date: 星期六, 16 九月 2023 11:18:46 +0800 Subject: [PATCH] app 2.0 --- cloud-server-activity/src/main/java/com/dsh/activity/controller/IntroduceRewardsController.java | 32 ++++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 10 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 0493559..1f2dbd0 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 @@ -1,8 +1,10 @@ package com.dsh.activity.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.dsh.activity.entity.IntroduceRewards; +import com.dsh.activity.feignclient.model.IntrduceOfUserRequest; import com.dsh.activity.feignclient.model.PurchaseRecordVo; import com.dsh.activity.service.IntroduceRewardsService; import io.swagger.annotations.Api; @@ -13,6 +15,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; @Api @CrossOrigin @@ -28,19 +31,28 @@ @PostMapping("/base/introduce/useOfRewards") - public List<PurchaseRecordVo> queryAppUsersofIntroduce(@RequestParam("startTime") Date startTime,@RequestParam("endTime") Date endTime,@RequestParam("userIds") List<Integer> userIds){ + public List<PurchaseRecordVo> queryAppUsersofIntroduce(@RequestBody IntrduceOfUserRequest request){ List<PurchaseRecordVo> recordVos = new ArrayList<>(); List<IntroduceRewards> list = idrService.list(new QueryWrapper<IntroduceRewards>() - .ge("startTime",startTime) - .lt("endTime",endTime)); - IntroduceRewards introduceRewards = list.get(0); - userIds.forEach( userId -> { - PurchaseRecordVo recordVo = new PurchaseRecordVo(); - recordVo.setPurchaseAmount("+"+introduceRewards.getGiveClass()); - recordVo.setPurchaseType("介绍有礼"); - recordVos.add(recordVo); - } ); + .ge("startTime",request.getStartTime()) + .lt("endTime",request.getEndTime())); + if (request.getUserIds().size() > 0 && list.size() > 0){ + IntroduceRewards introduceRewards = list.get(0); + request.getUserIds().forEach( userId -> { + PurchaseRecordVo recordVo = new PurchaseRecordVo(); + recordVo.setPurchaseAmount("+"+introduceRewards.getGiveClass()); + recordVo.setPurchaseType("介绍有礼"); + recordVos.add(recordVo); + } ); + } return recordVos; } + @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; + } + } -- Gitblit v1.7.1