From 7865a1010be2f95faab151d99ecdb095f44c2a08 Mon Sep 17 00:00:00 2001 From: lisy <linlangsur163@163.com> Date: 星期五, 14 七月 2023 16:30:34 +0800 Subject: [PATCH] 修复了积分商城详情页面的门店列表查询;兑换支付todo --- cloud-server-activity/src/main/java/com/dsh/activity/controller/IntroduceRewardsController.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 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..be27639 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 @@ -3,6 +3,7 @@ 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; @@ -11,7 +12,6 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Date; import java.util.List; @Api @@ -28,13 +28,13 @@ @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( IntrduceOfUserRequest request){ List<PurchaseRecordVo> recordVos = new ArrayList<>(); List<IntroduceRewards> list = idrService.list(new QueryWrapper<IntroduceRewards>() - .ge("startTime",startTime) - .lt("endTime",endTime)); + .ge("startTime",request.getStartTime()) + .lt("endTime",request.getEndTime())); IntroduceRewards introduceRewards = list.get(0); - userIds.forEach( userId -> { + request.getUserIds().forEach( userId -> { PurchaseRecordVo recordVo = new PurchaseRecordVo(); recordVo.setPurchaseAmount("+"+introduceRewards.getGiveClass()); recordVo.setPurchaseType("介绍有礼"); -- Gitblit v1.7.1