From dec64d47a9a3a3cc133afdf5141744d90fcb49b4 Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期一, 01 九月 2025 15:46:42 +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/controller/WorldCupController.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java index 1cdca40..77570a4 100644 --- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java +++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java @@ -1240,7 +1240,7 @@ public List<WorldCupUserListVo> userDetailsOfSearch(@RequestBody UserDetailsOfSearch search){ // 已报名的用户 List<WorldCupPaymentParticipant> list = worldCupPaymentParticipantService.list(new LambdaQueryWrapper<WorldCupPaymentParticipant>().eq(WorldCupPaymentParticipant::getWorldCupId, search.getId()) - .eq(WorldCupPaymentParticipant::getAlreadyEntered, 0)); + ); ArrayList<WorldCupUserListVo> worldCupUserListVos = new ArrayList<>(); if(list.size()>0){ List<Long> collect = list.stream().map(WorldCupPaymentParticipant::getParticipantId).collect(Collectors.toList()); @@ -1396,7 +1396,7 @@ vo.setType(10); userIntegralChangesClient.saveUserIntegralChanges(vo); } - worldCupCompetitor.setOpponentScore(redScore); + worldCupCompetitor.setOpponentScore(blueScore); worldCupCompetitor.setParticipationIntegral(worldCup.getParticipationIntegral()); //增加积分明细 SaveUserIntegralChangesVo vo = new SaveUserIntegralChangesVo(); -- Gitblit v1.7.1