From aa2c6d722ed799290285b6365f011aaa74373d73 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期六, 23 十二月 2023 17:30:07 +0800
Subject: [PATCH] 11.27,9
---
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 82 ++++++++++++++++++++++++++++++++++-------
1 files changed, 68 insertions(+), 14 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 8340f5c..1ad835f 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
@@ -11,7 +11,9 @@
import com.dsh.competition.entity.PaymentCompetition;
import com.dsh.competition.entity.UserCompetition;
import com.dsh.competition.feignclient.account.AppUserClient;
+import com.dsh.competition.feignclient.account.StudentClient;
import com.dsh.competition.feignclient.account.model.AppUser;
+import com.dsh.competition.feignclient.account.model.TStudent;
import com.dsh.competition.feignclient.course.CoursePackagePaymentClient;
import com.dsh.competition.feignclient.course.model.PaymentDeductionClassHour;
import com.dsh.competition.feignclient.model.*;
@@ -466,7 +468,6 @@
if (null != map) {
String code = map.get("out_trade_no");
String trade_no = map.get("trade_no");
-
PaymentCompetition paymentCompetition = paymentCompetitionService.getOne(new QueryWrapper<PaymentCompetition>().eq("code", code).eq("payType", 2));
if (paymentCompetition.getPayStatus() == 1) {
paymentCompetition.setAppUserId(null);
@@ -474,7 +475,6 @@
paymentCompetition.setPayTime(new Date());
paymentCompetition.setPayOrderNo(trade_no);
paymentCompetitionService.updateById(paymentCompetition);
-
Competition competition = cttService.getById(paymentCompetition.getCompetitionId());
competition.setApplicantsNumber(competition.getApplicantsNumber() + 1);
cttService.updateById(competition);
@@ -617,18 +617,21 @@
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.getRegisterCondition())) {
- wrapper.eq(Competition::getRegisterCondition, listQuery.getRegisterCondition());
+ if(ToolUtil.isNotEmpty(listQuery.getRegisterCondition())){
+ wrapper.eq(Competition::getRegisterCondition,listQuery.getRegisterCondition());
}
-
- wrapper.in(Competition::getStoreId, listQuery.getIds());
- wrapper.eq(Competition::getAuditStatus, 2);
+ // 平台查询审核通过的赛事
+ if (listQuery.getObj()==1){
+ wrapper.eq(Competition::getAuditStatus,2);
+ }
+ // 赛事审核
+ if (listQuery.getObj()==-1){
+ wrapper.ne(Competition::getAuditStatus,2);
+ }
+ wrapper.in(Competition::getStoreId,listQuery.getIds());
wrapper.orderByDesc(Competition::getInsertTime);
-
Page<Competition> page = cttService.page(competitionPage, wrapper);
for (Competition record : page.getRecords()) {
-
// 查询当前赛事有多少人报名了
List<UserCompetition> competitionId = ucttService.list(new QueryWrapper<UserCompetition>()
.eq("competitionId", record.getId()));
@@ -752,9 +755,7 @@
String refund_id = map.get("refund_id");
paymentCompetition.setRefundOrderNo(refund_id);
paymentCompetitionService.updateById(paymentCompetition);
-
storeClient.addBackRecord(paymentCompetition.getAmount() + "_" + paymentCompetition.getAppUserId());
-
}
if (paymentCompetition.getPayType() == 2) {//支付宝支付
@@ -831,6 +832,40 @@
}
}
+ @Resource
+ private StudentClient studentClient;
+ @PostMapping("/base/competition/getPeopleFromId1")
+ public List<CompetitionUser> getPeopleFromId1(@RequestBody GetPeopleQuery getPeopleQuery) {
+ try {
+ Page<UserCompetition> participantPage = new Page<>(getPeopleQuery.getOffset(), getPeopleQuery.getLimit());
+ List<CompetitionUser> page = participantService.getPeopleFromId1(participantPage, getPeopleQuery.getId(), getPeopleQuery.getState());
+
+ List<CompetitionUser> users = new ArrayList<>();
+ List<UserCompetition> coms = userCompetitionService.list(new QueryWrapper<UserCompetition>().eq("competitionId", getPeopleQuery.getId()));
+ for (UserCompetition com : coms) {
+ int number = com.getParticipantId();
+ String numberString = Integer.toString(number);
+ int digitCount = numberString.length();
+ if (digitCount!=9){
+ TStudent tStudent = studentClient.queryById(number);
+ CompetitionUser competitionUser = new CompetitionUser();
+ competitionUser.setName(tStudent.getName());
+ competitionUser.setPhone(tStudent.getPhone());
+ competitionUser.setSex(tStudent.getSex());
+ competitionUser.setIdCard(tStudent.getIdCard());
+ competitionUser.setState(tStudent.getState());
+ users.add(competitionUser);
+ }
+ }
+ page.addAll(users);
+
+ return page;
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+
@PostMapping("/base/competition/getPeoples")
@ResponseBody
public List<CompetitionUser> getPeoples(@RequestBody GetPeopleQuery getPeopleQuery) {
@@ -847,14 +882,21 @@
List<Integer> ids = queryDataFee.getIds();
if (ids.size() == 0) {
ids.add(-1);
+ }else{
+ List<Competition> list1 = competitionService.list(new QueryWrapper<Competition>().in("storeId", ids).eq("auditStatus", 2).eq("state", 1).ne("status", 4));
+ ids = list1.stream().map(Competition::getId).collect(Collectors.toList());
+ if (ids.size() == 0) {
+ ids.add(-1);
+ }
}
+
LambdaQueryWrapper<PaymentCompetition> vipPaymentLambdaQueryWrapper = new LambdaQueryWrapper<>();
if (ToolUtil.isNotEmpty(data)) {
String stime = data.split(" - ")[0] + " 00:00:00";
String etime = data.split(" - ")[1] + " 23:59:59";
vipPaymentLambdaQueryWrapper.between(PaymentCompetition::getInsertTime, stime, etime);
}
- vipPaymentLambdaQueryWrapper.in(PaymentCompetition::getAppUserId, ids);
+ vipPaymentLambdaQueryWrapper.in(PaymentCompetition::getCompetitionId, ids);
vipPaymentLambdaQueryWrapper.eq(PaymentCompetition::getPayStatus, 2);
ArrayList<Integer> objects = new ArrayList<>();
objects.add(1);
@@ -958,7 +1000,7 @@
m = "0" + i;
}
String s = year + "-" + m;
- int count = cttService.count(new LambdaQueryWrapper<Competition>().like(Competition::getInsertTime, s).ne(Competition::getOperatorId, operatorId));
+ int count = cttService.count(new LambdaQueryWrapper<Competition>().like(Competition::getInsertTime, s).eq(Competition::getOperatorId, operatorId));
int count1 = ucttService.count(new LambdaQueryWrapper<UserCompetition>().in(UserCompetition::getAppUserId, vo.getIds()).like(UserCompetition::getInsertTime, s));
months.add(count);
monthsUser.add(count1);
@@ -969,5 +1011,17 @@
return map;
}
+
+ @ResponseBody
+ @PostMapping("/base/competition/queryAppUserId")
+ public List<Integer> queryAppUserId(@RequestBody List<Integer> storeIds){
+ List<Competition> list = competitionService.list(new QueryWrapper<Competition>().in("storeId", storeIds).eq("auditStatus", 2).eq("state", 1));
+ List<Integer> collect = list.stream().map(Competition::getId).collect(Collectors.toList());
+ if(collect.size() == 0){
+ return new ArrayList<>();
+ }
+ List<PaymentCompetition> list1 = paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>().eq("payStatus", 2).eq("state", 1).in("competitionId", collect));
+ return list1.stream().map(PaymentCompetition::getAppUserId).collect(Collectors.toList());
+ }
}
--
Gitblit v1.7.1