From a89221efd99beffa3f295b1a5c427e1ea0537bad Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 05 三月 2024 09:31:38 +0800
Subject: [PATCH] 合并代码
---
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java
index 5b40b2e..295f885 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java
@@ -10,6 +10,9 @@
import com.dsh.communityWorldCup.feignclient.competition.ParticipantClient;
import com.dsh.communityWorldCup.feignclient.competition.model.Participant;
import com.dsh.communityWorldCup.mapper.WorldCupPaymentParticipantMapper;
+import com.dsh.communityWorldCup.model.MyWorldCupInfo;
+import com.dsh.communityWorldCup.model.MyWorldCupList;
+import com.dsh.communityWorldCup.model.WorldCupListVo;
import com.dsh.communityWorldCup.model.*;
import com.dsh.communityWorldCup.service.IWorldCupPaymentParticipantService;
import com.dsh.communityWorldCup.service.IWorldCupPaymentService;
@@ -82,7 +85,7 @@
WorldCupPaymentParticipant worldCupPaymentParticipant = this.getById(id);
Integer worldCupId = worldCupPaymentParticipant.getWorldCupId();
WorldCupPayment worldCupPayment = worldCupPaymentService.getById(worldCupPaymentParticipant.getWorldCupPaymentId());
- WorldCupInfo worldCupInfo = worldCupService.getWorldCupInfo(worldCupId);
+ WorldCupInfo worldCupInfo = worldCupService.getWorldCupInfo(worldCupId, null, null);
WorldCup worldCup = worldCupService.getById(worldCupId);
MyWorldCupInfo myWorldCupInfo = new MyWorldCupInfo();
BeanUtils.copyProperties(worldCupInfo, myWorldCupInfo);
--
Gitblit v1.7.1