From 3caee5ce51a218f4bc1f3757a4d09b0ed18aa6df Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 06 十一月 2023 14:21:12 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
index ff4b14f..3424582 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
@@ -75,7 +75,36 @@
@Autowired
private AppUserClient appUserClient;
+ /**
+ * 根据门店ids 获取对应的赛事 根据赛事支付记录获取用户ids
+ */
+ @ResponseBody
+ @PostMapping("/base/competition/getUserIds")
+ public List<Integer> getUserIds(@RequestBody ListQuery query){
+ List<Competition> list = cttService.list(new QueryWrapper<Competition>());
+ // 赛事id集合
+ List<Integer> comIds = new ArrayList<>();
+ for (Integer id : query.getIds()) {
+ for (Competition competition : list) {
+ if (competition.getStoreId().contains(id.toString())){
+ comIds.add(competition.getId());
+ }
+ }
+ }
+ // 获取到赛事id集合 去重
+ List<Integer> collect = comIds.stream().distinct().collect(Collectors.toList());
+ // 根据赛事id 查询赛事支付记录 获取用户ids
+ if (collect.size() == 0){
+ return new ArrayList<>();
+ }else{
+ List<Integer> userIds = paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>()
+ .in("competitionId", collect)).stream()
+ .map(PaymentCompetition::getAppUserId).collect(Collectors.toList());
+ return userIds;
+ }
+
+ }
/**
* 获取赛事报名记录
*/
@@ -565,15 +594,14 @@
wrapper.like(Competition::getName,listQuery.getEventName());
}
if(ToolUtil.isNotEmpty(listQuery.getTime())){
- wrapper.gt(Competition::getStartTime,listQuery.getTime().split(" - ")[0]+" 00:00:00");
- wrapper.lt(Competition::getEndTime,listQuery.getTime().split(" - ")[1]+" 23:59:59");
+ wrapper.lt(Competition::getStartTime,listQuery.getTime().split(" - ")[0]+" 00:00:00");
+ wrapper.gt(Competition::getEndTime,listQuery.getTime().split(" - ")[1]+" 23:59:59");
}
- if(ToolUtil.isNotEmpty(listQuery.getState())){
- wrapper.eq(Competition::getStatus,listQuery.getState());
- }
+
if(ToolUtil.isNotEmpty(listQuery.getRegisterCondition())){
wrapper.eq(Competition::getRegisterCondition,listQuery.getRegisterCondition());
}
+
wrapper.in(Competition::getStoreId,listQuery.getIds());
wrapper.eq(Competition::getAuditStatus,2);
wrapper.orderByDesc(Competition::getInsertTime);
@@ -594,7 +622,7 @@
wrapper.eq(Competition::getProvinceCode,listQuery.getProvinceCode());
}
if(ToolUtil.isNotEmpty(listQuery.getCityCode())){
- wrapper.eq(Competition::getProvinceCode,listQuery.getCityCode());
+ wrapper.eq(Competition::getCityCode,listQuery.getCityCode());
}
if(ToolUtil.isNotEmpty(listQuery.getEventName())){
wrapper.like(Competition::getName,listQuery.getEventName());
--
Gitblit v1.7.1