From 47e23cf659d4cc58bc93b44b16e64e82efcfb08d Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期三, 24 七月 2024 17:34:27 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupController.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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 4249541..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
@@ -199,12 +199,17 @@
if(worldCup1.getStartTime().before(DateUtil.getDate())){
return ResultUtil.error("赛事已开始，不能编辑");
}
+ 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(worldCup);
+ worldCupClient.editWorldCup(JSON.toJSONString(worldCup));
worldCupStoreClient.delWorldCupStore(worldCup.getId());
JSONArray jsonArray = JSON.parseArray(stores);
for (int i = 0; i < jsonArray.size(); i++) {
@@ -232,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