From 59199429f86868d9259e62093abae357c4a6da1d Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期三, 12 七月 2023 10:51:51 +0800
Subject: [PATCH] 使用福利：充值中心的赛事报名记录
---
cloud-server-competition/src/main/java/com/dsh/competition/feignclient/DeductionCompetitionsClient.java | 3 +++
cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java | 18 ++++++++++++++++--
cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java | 3 +++
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 9 +++++++++
4 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java
index fe9c47e..fc6962a 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java
@@ -20,4 +20,7 @@
@PostMapping("/base/competition/getCancelOrderOfUserPay")
public List<PaymentCompetition> getCancelOrderOfUserPayRecord(@RequestBody Integer appUserId);
+
+ @PostMapping("/base/competition/getPlayPaiFGoldPayRecord")
+ List<PaymentCompetition> getPlayPaiFGoldPayRecord(@RequestBody Integer appUserId);
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java
index eb4abaf..0c946de 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java
@@ -5,6 +5,8 @@
import com.dsh.account.entity.RechargeRecords;
import com.dsh.account.entity.TAppUser;
import com.dsh.account.enums.RechargeRecordEnum;
+import com.dsh.account.feignclient.competition.DeductionCompetitionsClient;
+import com.dsh.account.feignclient.competition.model.PaymentCompetition;
import com.dsh.account.feignclient.course.CoursePaymentClient;
import com.dsh.account.feignclient.course.model.TCoursePackagePayment;
import com.dsh.account.feignclient.other.RechargeConfigClient;
@@ -51,6 +53,9 @@
private CoursePaymentClient cpClient;
@Autowired
+ private DeductionCompetitionsClient deducClient;
+
+ @Autowired
private PayMoneyUtil payMoneyUtil;
@@ -63,7 +68,7 @@
RechargeDetailsVo vo = new RechargeDetailsVo();
List<RechargeDetailsVo.RechargesDetail> details = new ArrayList<>();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM-dd HH:mm");
- // TODO: 2023/7/11 充值明细查询
+
Date monthStart = null;
Date monthEnd = null;
if (StringUtils.hasText(yearMonth)) {
@@ -81,7 +86,16 @@
vo.setWpGold(0);
}
// 1.赛事报名
-
+ List<PaymentCompetition> playPaiFGoldPayRecord = deducClient.getPlayPaiFGoldPayRecord(appUserId);
+ if (playPaiFGoldPayRecord.size() > 0 ){
+ for (PaymentCompetition competition : playPaiFGoldPayRecord) {
+ RechargeDetailsVo.RechargesDetail consumeDetail = new RechargeDetailsVo.RechargesDetail();
+ consumeDetail.setConsumeName(RechargeRecordEnum.EVENT_REGISTRATION.getMsg() );
+ consumeDetail.setConsumeTime(simpleDateFormat.format(competition.getInsertTime()));
+ consumeDetail.setConsumeAmount("-" + competition.getAmount());
+ details.add(consumeDetail);
+ }
+ }
// 2.课包购买
List<TCoursePackagePayment> appuserCourseList = cpClient.getAppuserCourseList(appUserId);
if (appuserCourseList.size() > 0){
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
index 79a520b..2ba5aa7 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
@@ -87,6 +87,15 @@
}
+ @PostMapping("/base/competition/getPlayPaiFGoldPayRecord")
+ public List<PaymentCompetition> getPlayPaiFGoldPayRecord(@RequestBody Integer appUserId){
+ return paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>()
+ .eq("payType",3)
+ .eq("appUserId",appUserId)
+ .eq("payStatus",3));
+ }
+
+
@PostMapping("/base/competition/getCompetitionsDetails")
public List<PurchaseRecordVo> getStuSourseList(@RequestBody GetStuSourseList sourseList){
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/DeductionCompetitionsClient.java b/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/DeductionCompetitionsClient.java
index 1567a97..c7292bb 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/DeductionCompetitionsClient.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/DeductionCompetitionsClient.java
@@ -22,4 +22,7 @@
@PostMapping("/base/competition/getCancelOrderOfUserPay")
public List<PaymentCompetition> getCancelOrderOfUserPayRecord(@RequestBody Integer appUserId);
+ @PostMapping("/base/competition/getPlayPaiFGoldPayRecord")
+ List<PaymentCompetition> getPlayPaiFGoldPayRecord(@RequestBody Integer appUserId);
+
}
--
Gitblit v1.7.1