From b3e0d0ea6c1e311566bab861b79cc9b9c6d25287 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 15 三月 2024 09:49:03 +0800
Subject: [PATCH] 修改bug
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 8989a5c..95aef7a 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
@@ -205,21 +205,21 @@
//世界杯
GetWorldCupPayment getWorldCupPayment = new GetWorldCupPayment();
getWorldCupPayment.setAppUserId(appUserId);
- getWorldCupPayment.setPayType(3);
+ getWorldCupPayment.setPayType("3");
getWorldCupPayment.setStartTime(monthStart);
getWorldCupPayment.setEndTime(monthEnd);
List<WorldCupPayment> worldCupPayment = worldCupPaymentClinet.getWorldCupPayment(getWorldCupPayment);
for (WorldCupPayment cupPayment : worldCupPayment) {
RechargesDetail consumeDetail = new RechargesDetail();
if(cupPayment.getPayStatus() != 3){
- consumeDetail.setConsumeName(RechargeRecordEnum.WORLD_CIP_PAYMENT.getMsg() + "：￥" + cupPayment.getAmount());
+ consumeDetail.setConsumeName(RechargeRecordEnum.WORLD_CIP_PAYMENT.getMsg());
consumeDetail.setConsumeTime(simpleDateFormat.format(cupPayment.getCreateTime()));
consumeDetail.setConsumeAmount("-" + cupPayment.getAmount());
consumeDetail.setRecordId(2);
}else{
- consumeDetail.setConsumeName(RechargeRecordEnum.CANCEL_WORLD_CIP_PAYMENT.getMsg() + "：￥" + cupPayment.getAmount());
+ consumeDetail.setConsumeName(RechargeRecordEnum.CANCEL_WORLD_CIP_PAYMENT.getMsg());
consumeDetail.setConsumeTime(simpleDateFormat.format(cupPayment.getCreateTime()));
- consumeDetail.setConsumeAmount("+" + cupPayment.getAmount());
+ consumeDetail.setConsumeAmount("+" + cupPayment.getRefundAmount());
consumeDetail.setRecordId(1);
}
details.add(consumeDetail);
--
Gitblit v1.7.1