From 228c40ba253e57a10abb435afb6889c8ed27ec55 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 07 三月 2024 11:11:24 +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 | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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 9aab809..c68b323 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
@@ -154,13 +154,13 @@
worldCupCompetitorService.save(worldCupCompetitor);
ids.add(worldCupCompetitor.getId());
//已参赛
- worldCupPaymentParticipant.setAlreadyEntered(1);
+// worldCupPaymentParticipant.setAlreadyEntered(1);
worldCupPaymentParticipantService.updateById(worldCupPaymentParticipant);
}
//2、调起开启游戏的接口。
HashMap<String, String> map = new HashMap<>();
map.put("sign", "0DB011836143EEE2C2E072967C9F4E4B");
- map.put("space_id", tGame.getSiteId() + "");
+ map.put("space_id", tGame.getStoreId() + "");
map.put("red_sutu_id", tGame.getRed());
map.put("blue_sutu_id", tGame.getBlue());
map.put("api_url", "http://221.182.45.100:56666/communityWorldCup/base/worldCup/endWorldCupCallback");
@@ -355,6 +355,11 @@
WorldCup worldCup = this.getById(paymentWorldCup.getId());
if(null == worldCup){
return ResultUtil.error("报名数据异常");
+ }
+ WorldCupPayment one = worldCupPaymentService.getOne(new QueryWrapper<WorldCupPayment>().eq("worldCupId", worldCup.getId())
+ .eq("appUserId", paymentWorldCup.getUid()).eq("payStatus", 2).eq("state", 1));
+ if(null != one){
+ return ResultUtil.error("不能重复报名");
}
if(null != worldCup.getRegistrationClosingTime() && System.currentTimeMillis() > worldCup.getRegistrationClosingTime().getTime()){
return ResultUtil.error("报名时间已结束，无法完成报名");
@@ -766,12 +771,11 @@
if(collect.size() == 0){
stringObjectMap.put("applicants", 0);
}else{
- int count1 = worldCupPaymentParticipantService.count(new QueryWrapper<WorldCupPaymentParticipant>()
- .eq("worldCupId", id).in("worldCupPaymentId", collect)
- .groupBy("worldCupPaymentId, participantType"));
+ int count1 = worldCupPaymentParticipantService.getCount(id, collect);
stringObjectMap.put("applicants", count1);
}
}
+ map.put("rows", mapList);
int count = this.baseMapper.worldCupGameStatisticsCount(worldCupGameStatistics);
map.put("total", count);
return map;
--
Gitblit v1.7.1