From 39518349b9b4b2e2fd0bf153623c8d88301c539e Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期四, 03 八月 2023 21:35:53 +0800
Subject: [PATCH] 修复了开始上课的冗余勋章列表查询bug
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/IntroduceRewardsController.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 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 beaf70d..1c36d9b 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
@@ -27,19 +27,21 @@
private final SimpleDateFormat mat = new SimpleDateFormat("MM-dd HH:mm");
- @PostMapping("/introduce/useOfRewards")
- public List<PurchaseRecordVo> queryAppUsersofIntroduce(@RequestBody Date startTime, @RequestBody Date endTime, @RequestBody List<Integer> userIds){
+ @PostMapping("/base/introduce/useOfRewards")
+ 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;
}
--
Gitblit v1.7.1