From f195cf48cf57635c8848b2bc32afd4541c4090ed Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 17 七月 2023 08:57:25 +0800
Subject: [PATCH] 更新接口
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 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..b5dbc63 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){
@@ -158,7 +172,7 @@
private ResultUtil AlipayPayment(String code,BigDecimal amount) {
- ResultUtil alipay = payMoneyUtil.alipay("玩湃币充值", "", "", code, amount.toString(),
+ ResultUtil alipay = payMoneyUtil.alipay("玩湃币充值", "玩湃币充值", "", code, amount.toString(),
"/base/recharge/alipayRechargeCallback");
if(alipay.getCode() == 200){
new Thread(new Runnable() {
--
Gitblit v1.7.1