From f401b388a30a760431ff0648dbfcd95d24112e5b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 25 三月 2024 17:37:10 +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/WorldCupCompetitorServiceImpl.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java
index 1866b2b..da91d5d 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java
@@ -1,6 +1,7 @@
package com.dsh.communityWorldCup.service.impl;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsh.communityWorldCup.entity.WorldCup;
@@ -271,7 +272,13 @@
*/
@Override
public void endWorldCupCallback(String custom, Integer red_score, Integer blue_score) {
- List<Long> ids = JSON.parseArray(custom, Long.class);
+ JSONObject jsonObject = JSON.parseObject(custom);
+ Integer gameType = jsonObject.getInteger("gameType");
+ //智慧球场比赛
+ if(2 == gameType){
+ return;
+ }
+ List<Long> ids = jsonObject.getJSONArray("ids").toJavaList(Long.class);
List<WorldCupCompetitor> worldCupCompetitors = this.listByIds(ids);
try {
WorldCupCompetitor worldCupCompetitor1 = worldCupCompetitors.get(0);
@@ -472,7 +479,7 @@
SimpleDateFormat sdf = new SimpleDateFormat("yyyy.HH.dd HH:mm");
for (WorldCupCompetitor cupCompetitor : list) {
Map<String, Object> map = new HashMap<>();
- map.put("id", cupCompetitor.getId());
+ map.put("id", cupCompetitor.getId().toString());
if(1 == participantType){
TStudent tStudent = studentClient.queryById(participantId.intValue());
if(ToolUtil.isNotEmpty(name) && tStudent.getName().indexOf(name) == -1){
@@ -488,10 +495,10 @@
map.put("name", participant.getName());
}
map.put("startTime", sdf.format(cupCompetitor.getStartTime()));
- map.put("score", cupCompetitor.getOurScore().compareTo(cupCompetitor.getOpponentScore()) > 0 ?
- cupCompetitor.getOurScore() + ":" + cupCompetitor.getOpponentScore() :
- cupCompetitor.getOpponentScore() + ":" + cupCompetitor.getOurScore());
+ map.put("score", cupCompetitor.getOurScore() + ":" + cupCompetitor.getOpponentScore());
map.put("matchResult", cupCompetitor.getMatchResult() == 1 ? "胜" : cupCompetitor.getMatchResult() == 0 ? "平" : "负");
+ map.put("blue", cupCompetitor.getParticipant() == 1 ? cupCompetitor.getOurScore() : cupCompetitor.getOpponentScore());
+ map.put("red", cupCompetitor.getParticipant() == 2 ? cupCompetitor.getOurScore() : cupCompetitor.getOpponentScore());
mapList.add(map);
}
Map<String, Object> map = new HashMap<>();
@@ -512,7 +519,7 @@
Integer red = changeScore.getRed();
WorldCupCompetitor worldCupCompetitor = this.getById(id);
List<WorldCupCompetitor> blueList = this.list(new QueryWrapper<WorldCupCompetitor>().eq("code", worldCupCompetitor.getCode())
- .eq("participant", 1));
+ .eq("participant", 1).eq("worldCupId", worldCupCompetitor.getWorldCupId()));
WorldCup worldCup = worldCupService.getById(blueList.get(0).getWorldCupId());
for (WorldCupCompetitor cupCompetitor : blueList) {
//如果之前输了，现在赢/平了，需要增加积分
@@ -553,10 +560,12 @@
}
cupCompetitor.setOurScore(blue);
cupCompetitor.setOpponentScore(red);
+ cupCompetitor.setWorldCupId(null);
}
this.updateBatchById(blueList);
- List<WorldCupCompetitor> redList = this.list(new QueryWrapper<WorldCupCompetitor>().eq("code", worldCupCompetitor.getCode()).eq("participant", 2));
+ List<WorldCupCompetitor> redList = this.list(new QueryWrapper<WorldCupCompetitor>().eq("code", worldCupCompetitor.getCode())
+ .eq("participant", 2).eq("worldCupId", worldCupCompetitor.getWorldCupId()));
for (WorldCupCompetitor cupCompetitor : redList) {
//如果之前输了，现在赢/平了，需要增加积分
if(cupCompetitor.getMatchResult() == -1 && (red.compareTo(blue) > 0 || red.compareTo(blue) == 0)){
@@ -596,8 +605,9 @@
}
cupCompetitor.setOurScore(red);
cupCompetitor.setOpponentScore(blue);
+ cupCompetitor.setWorldCupId(null);
}
- this.updateBatchById(blueList);
+ this.updateBatchById(redList);
//修改勋章
--
Gitblit v1.7.1