From b1069cdbce2086877055c32a19a0ab51b29331a8 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 21 三月 2024 17:26:22 +0800
Subject: [PATCH] 修改bug
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupController.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupController.java
index 150060b..1f793ff 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupController.java
@@ -161,7 +161,11 @@
@ResponseBody
@PostMapping("/addWorldCup")
public ResultUtil addWorldCup(WorldCup worldCup, String stores){
- worldCup.setStatus(1);
+ if(worldCup.getStartTime().before(new Date())){
+ worldCup.setStatus(2);
+ }else{
+ worldCup.setStatus(1);
+ }
worldCup.setCreateTime(new Date());
worldCup.setMatchNumber(0);
Integer integer = worldCupClient.addWorldCup(worldCup);
@@ -195,7 +199,17 @@
if(worldCup1.getStartTime().before(DateUtil.getDate())){
return ResultUtil.error("赛事已开始，不能编辑");
}
- worldCupClient.editWorldCup(worldCup);
+ Integer maxPeople = worldCup1.getMaxPeople();
+ int registeredNumber = worldCupClient.getRegisteredNumber(worldCup.getId());
+ if(maxPeople.compareTo(registeredNumber) < 0){
+ return ResultUtil.error("报名人数不能小于已报名人数");
+ }
+ if(worldCup.getStartTime().before(new Date())){
+ worldCup.setStatus(2);
+ }else{
+ worldCup.setStatus(1);
+ }
+ worldCupClient.editWorldCup(JSON.toJSONString(worldCup));
worldCupStoreClient.delWorldCupStore(worldCup.getId());
JSONArray jsonArray = JSON.parseArray(stores);
for (int i = 0; i < jsonArray.size(); i++) {
@@ -223,7 +237,7 @@
WorldCup worldCup = new WorldCup();
worldCup.setId(id);
worldCup.setStatus(state);
- worldCupClient.editWorldCup(worldCup);
+ worldCupClient.editWorldCup(JSON.toJSONString(worldCup));
//开始处理已支付的退费
worldCupClient.cancelWorldCupRefund(id);
return ResultUtil.success();
--
Gitblit v1.7.1