From a1b33924831ae00398ae3cd75e4801b8b57cb89d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 12 三月 2024 14:19:17 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java
index cd2e3db..1348a56 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java
@@ -165,6 +165,9 @@
// worldCupPaymentParticipant.setAlreadyEntered(1);
// worldCupPaymentParticipantService.updateById(worldCupPaymentParticipant);
}
+ worldCup.setMatchNumber(worldCup.getMatchNumber() + 1);
+ this.updateById(worldCup);
+
//2、调起开启游戏的接口。
HashMap<String, String> map = new HashMap<>();
map.put("sign", "0DB011836143EEE2C2E072967C9F4E4B");
@@ -249,7 +252,7 @@
Collections.sort(worldCupList1, new Comparator<WorldCupListVo>() {
@Override
public int compare(WorldCupListVo o1, WorldCupListVo o2) {
- return o1.getDistance().compareTo(o2.getDistance()) * -1;
+ return o1.getDistance().compareTo(o2.getDistance());
}
});
}
@@ -388,11 +391,26 @@
if(System.currentTimeMillis() > worldCup.getEndTime().getTime()){
return ResultUtil.error("世界杯赛事已结束，无法完成报名");
}
+
+ String cupIds = paymentWorldCup.getIds();
+ JSONArray jsonArray = JSON.parseArray(cupIds);
+ if(jsonArray.size() != 6){
+ return ResultUtil.error("参赛人数只能是6人");
+ }
+ List<WorldCupPayment> payments = worldCupPaymentService.list(new QueryWrapper<WorldCupPayment>().eq("worldCupId", worldCup.getId())
+ .eq("payStatus", 2).eq("state", 1));
+ List<Long> ids = payments.stream().map(WorldCupPayment::getId).collect(Collectors.toList());
+ if(ids.size() > 0){
+ int count = worldCupPaymentParticipantService.count(new QueryWrapper<WorldCupPaymentParticipant>().eq("worldCupId", worldCup.getId())
+ .eq("worldCupPaymentId", ids));
+ if((count + jsonArray.size()) >= worldCup.getMaxPeople()){
+ return ResultUtil.error("已超出最大报名人数");
+ }
+ }
+
List<WorldCupPayment> list = worldCupPaymentService.list(new QueryWrapper<WorldCupPayment>().eq("worldCupId", worldCup.getId()).eq("appUserId", paymentWorldCup.getUid())
.eq("payStatus", 2).eq("state", 1));
List<Long> collect = list.stream().map(WorldCupPayment::getId).collect(Collectors.toList());
- String ids = paymentWorldCup.getIds();
- JSONArray jsonArray = JSON.parseArray(ids);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
for (int i = 0; i < jsonArray.size(); i++) {
JSONObject jsonObject = jsonArray.getJSONObject(i);
@@ -401,6 +419,9 @@
Integer isStudent = jsonObject.getInteger("isStudent");
if(isStudent == 1){
TStudent tStudent = studentClient.queryById(id.intValue());
+ if(worldCup.getGender() != 0 && !tStudent.getSex().equals(worldCup.getGender())){
+ return ResultUtil.error("此比赛只能是" + (worldCup.getGender() == 1 ? "男" : "女") + "性参加");
+ }
if(collect.size() > 0){
WorldCupPaymentParticipant one = worldCupPaymentParticipantService.getOne(new QueryWrapper<WorldCupPaymentParticipant>().eq("worldCupId", worldCup.getId())
.eq("participantId", id).eq("participantType", isStudent == 0 ? 2 : 1).in("worldCupPaymentId", collect));
@@ -417,6 +438,9 @@
}
}else{
Participant participant = participantClient.getParticipant(id);
+ if(worldCup.getGender() != 0 && !participant.getGender().equals(worldCup.getGender())){
+ return ResultUtil.error("此比赛只能是" + (worldCup.getGender() == 1 ? "男" : "女") + "性参加");
+ }
if(collect.size() > 0){
WorldCupPaymentParticipant one = worldCupPaymentParticipantService.getOne(new QueryWrapper<WorldCupPaymentParticipant>().eq("worldCupId", worldCup.getId())
.eq("participantId", id).eq("participantType", isStudent == 0 ? 2 : 1).in("worldCupPaymentId", collect));
@@ -827,4 +851,13 @@
map.put("total", count);
return map;
}
+
+ /**
+ * 修改所有参数
+ * @param worldCup
+ */
+ @Override
+ public void updateWorldCupAll(WorldCup worldCup) {
+ this.baseMapper.updateWorldCupAll(worldCup);
+ }
}
--
Gitblit v1.7.1