java/PlayPai.git

			@@ -1396,7 +1396,7 @@
			vo.setType(10);
			userIntegralChangesClient.saveUserIntegralChanges(vo);
			}
			worldCupCompetitor.setOpponentScore(redScore);
			worldCupCompetitor.setOpponentScore(blueScore);
			worldCupCompetitor.setParticipationIntegral(worldCup.getParticipationIntegral());
			//增加积分明细
			SaveUserIntegralChangesVo vo = new SaveUserIntegralChangesVo();

			@@ -247,7 +247,6 @@
			// });
			// }


			List<WorldCupRankVo> list = new ArrayList<>();
			for (int i = 0; i < mapList.size(); i++) {
			Map<String, Object> map = mapList.get(i);
			@@ -303,6 +302,7 @@
			if(i == 19 && b){
			break;
			}

			//排名前20的数据添加完成后且包含自己，需要将自己找出来后添加到21位
			if(i > 19 && !b){
			if(worldCupRank.getIsStudent().compareTo(participantType) == 0 && worldCupRank.getId().compareTo(participantId) == 0){
			@@ -343,6 +343,11 @@
			}
			// 排序
			list= list.stream().sorted(Comparator.comparing(WorldCupRankVo::getIntegral).reversed().thenComparing(WorldCupRankVo::getTotalSession).reversed().thenComparing(WorldCupRankVo::getWinRate).reversed()).collect(Collectors.toList());
			int a=1;
			for (WorldCupRankVo worldCupRankVo : list) {
			worldCupRankVo.setRank(a);
			a++;
			}
			return list;
			}

			@@ -668,7 +673,7 @@
			}
			map.put("startTime", sdf.format(cupCompetitor.getStartTime()));
			map.put("score", cupCompetitor.getOurScore() + ":" + cupCompetitor.getOpponentScore());
			map.put("matchResult", cupCompetitor.getMatchResult() == 1 ? "胜" : cupCompetitor.getMatchResult() == 0 ? "平" : "负");
			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);

			@@ -1084,7 +1084,7 @@
			vo.setType(9);
			userIntegralChangesClient.saveUserIntegralChanges(vo);
			}else if(null != worldCup.getLoseIntegral() && 0 < worldCup.getLoseIntegral() && blue_score.compareTo(red_score) < 0){
			worldCupCompetitor.setDrawIntegral(worldCup.getLoseIntegral());
			worldCupCompetitor.setLoseIntegral(worldCup.getLoseIntegral());
			//增加积分明细
			SaveUserIntegralChangesVo vo = new SaveUserIntegralChangesVo();
			vo.setAppUserId(worldCupCompetitor.getAppUserId());

	cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史