From e0ec0a20cb943b4ee92c45b64f02b007a003b0ba Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期五, 01 三月 2024 18:22:11 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0 --- cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/IWorldCupService.java | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/IWorldCupService.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/IWorldCupService.java index 80f73ef..e462205 100644 --- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/IWorldCupService.java +++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/IWorldCupService.java @@ -4,6 +4,7 @@ import com.dsh.communityWorldCup.entity.WorldCup; import com.dsh.communityWorldCup.model.*; import com.dsh.communityWorldCup.util.ResultUtil; +import org.springframework.web.bind.annotation.RequestBody; import java.util.List; @@ -50,5 +51,30 @@ * @param id * @return */ - WorldCupInfo getWorldCupInfo(Integer id); + WorldCupInfo getWorldCupInfo(Integer id, String lon, String lat); + + + /** + * 报名前校验支付方式 + * @param checkPaymentMethod + * @return + */ + CheckPaymentMethodVo checkPaymentMethod(CheckPaymentMethod checkPaymentMethod); + + + /** + * 报名世界杯 + * @param paymentWorldCup + * @return + */ + ResultUtil paymentWorldCup(PaymentWorldCup paymentWorldCup); + + + /** + * 第三方支付完成后回调逻辑处理 + * @param code + * @param outTradeNo + * @return + */ + ResultUtil paymentWorldCupCallback(String code, String outTradeNo); } -- Gitblit v1.7.1