From cdd29e40b2cd26c5a4b405adc25cfe3711794bf6 Mon Sep 17 00:00:00 2001 From: lisy <linlangsur163@163.com> Date: 星期五, 14 七月 2023 18:29:29 +0800 Subject: [PATCH] 筛选出剩余未处理的接口 --- cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) 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..1ea67af 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){ @@ -94,6 +108,8 @@ } } // 3.场地预约 + // TODO: 2023/7/14 充值明细的场地预约查询 + // 4.智慧球场 // 5.充值 -- Gitblit v1.7.1