From 2493985a5bdfc6496381b39de0f9713b79c2e51d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 25 十一月 2023 11:14:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java | 86 +++++++++++++++++++++++++++++++-----------
1 files changed, 63 insertions(+), 23 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 4349abc..0100c27 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
@@ -96,12 +96,32 @@
List<PaymentCompetition> playPaiFGoldPayRecord = deducClient.getPlayPaiFGoldPayRecord(appUserId);
if (playPaiFGoldPayRecord.size() > 0 ){
for (PaymentCompetition competition : playPaiFGoldPayRecord) {
- RechargesDetail consumeDetail = new RechargesDetail();
- consumeDetail.setConsumeName(RechargeRecordEnum.EVENT_REGISTRATION.getMsg() );
- consumeDetail.setConsumeTime(simpleDateFormat.format(competition.getInsertTime()));
- consumeDetail.setConsumeAmount("-" + competition.getAmount());
- consumeDetail.setRecordId(2);
- details.add(consumeDetail);
+ if (competition.getPayStatus()==2) {
+ RechargesDetail consumeDetail = new RechargesDetail();
+ consumeDetail.setConsumeName(RechargeRecordEnum.EVENT_REGISTRATION.getMsg());
+ consumeDetail.setConsumeTime(simpleDateFormat.format(competition.getInsertTime()));
+ consumeDetail.setConsumeAmount("-" + competition.getAmount());
+ consumeDetail.setRecordId(2);
+ details.add(consumeDetail);
+ }else {
+
+
+ RechargesDetail consumeDetail1 = new RechargesDetail();
+ consumeDetail1.setConsumeName(RechargeRecordEnum.CANCEL_EVENT_REGISTRATION.getMsg());
+ consumeDetail1.setConsumeTime(simpleDateFormat.format(competition.getRefundTime()));
+ consumeDetail1.setConsumeAmount("+" + competition.getAmount());
+ consumeDetail1.setRecordId(1);
+ details.add(consumeDetail1);
+
+ RechargesDetail consumeDetail = new RechargesDetail();
+ consumeDetail.setConsumeName(RechargeRecordEnum.EVENT_REGISTRATION.getMsg());
+ consumeDetail.setConsumeTime(simpleDateFormat.format(competition.getInsertTime()));
+ consumeDetail.setConsumeAmount("-" + competition.getAmount());
+ consumeDetail.setRecordId(2);
+ details.add(consumeDetail);
+
+
+ }
}
}
// 2.课包购买
@@ -120,12 +140,31 @@
List<SiteBooking> siteBookings = stClient.wanpaiGoldSiteBookingList(appUserId);
if (siteBookings.size() > 0 ){
for (SiteBooking booking : siteBookings) {
- RechargesDetail consumeDetail = new RechargesDetail();
- consumeDetail.setConsumeName(RechargeRecordEnum.VENUE_RESERVATION.getMsg());
- consumeDetail.setConsumeTime(simpleDateFormat.format(booking.getInsertTime()));
- consumeDetail.setConsumeAmount("-" + booking.getPayMoney());
- consumeDetail.setRecordId(2);
- details.add(consumeDetail);
+ if (booking.getStatus()!=5) {
+ RechargesDetail consumeDetail = new RechargesDetail();
+ consumeDetail.setConsumeName(RechargeRecordEnum.VENUE_RESERVATION.getMsg());
+ consumeDetail.setConsumeTime(simpleDateFormat.format(booking.getInsertTime()));
+ consumeDetail.setConsumeAmount("-" + booking.getPayMoney());
+ consumeDetail.setRecordId(2);
+ details.add(consumeDetail);
+ }else {
+ RechargesDetail consumeDetail1 = new RechargesDetail();
+ consumeDetail1.setConsumeName(RechargeRecordEnum.CANCEL_VENUE_RESERVATION.getMsg());
+ consumeDetail1.setConsumeTime(simpleDateFormat.format(booking.getCancelTime()));
+ consumeDetail1.setConsumeAmount("+" + booking.getPayMoney());
+ consumeDetail1.setRecordId(1);
+ details.add(consumeDetail1);
+
+ RechargesDetail consumeDetail = new RechargesDetail();
+ consumeDetail.setConsumeName(RechargeRecordEnum.VENUE_RESERVATION.getMsg());
+ consumeDetail.setConsumeTime(simpleDateFormat.format(booking.getInsertTime()));
+ consumeDetail.setConsumeAmount("-" + booking.getPayMoney());
+ consumeDetail.setRecordId(2);
+ details.add(consumeDetail);
+
+
+
+ }
}
}
// 4.智慧球场
@@ -150,9 +189,9 @@
if (rechargeRecords.size() > 0) {
for (RechargeRecords rechargeRecord : rechargeRecords) {
RechargesDetail consumeDetail = new RechargesDetail();
- consumeDetail.setConsumeName(RechargeRecordEnum.RECHARGE.getMsg() + "：" + rechargeRecord.getPlayPaiCoins());
+ consumeDetail.setConsumeName(RechargeRecordEnum.RECHARGE.getMsg() + "：￥" + rechargeRecord.getAmount());
consumeDetail.setConsumeTime(simpleDateFormat.format(rechargeRecord.getInsertTime()));
- consumeDetail.setConsumeAmount("+" + rechargeRecord.getAmount());
+ consumeDetail.setConsumeAmount("+" + rechargeRecord.getPlayPaiCoins());
consumeDetail.setRecordId(1);
details.add(consumeDetail);
}
@@ -301,15 +340,16 @@
records.setOrderNumber(tradeNo);
rereMapper.updateById(records);
-// RechargeRecords rechargeRecords = rereMapper.selectOne(new QueryWrapper<RechargeRecords>()
-// .eq("code", code));
-// if (rechargeRecords.getPayStatus() == 2){
-// break;
-// }
-//
-// TAppUser tAppUser = tappMapper.selectById(rechargeRecords.getAppUserId());
-// tAppUser.setPlayPaiCoins(null == tAppUser.getPlayPaiCoins()? rechargeRecords.getPlayPaiCoins(): tAppUser.getPlayPaiCoins() +rechargeRecords.getPlayPaiCoins() );
-// tappMapper.updateById(tAppUser);
+ RechargeRecords rechargeRecords = rereMapper.selectOne(new QueryWrapper<RechargeRecords>()
+ .eq("code", code));
+ if (rechargeRecords.getPayStatus() == 2){
+ TAppUser tAppUser = tappMapper.selectById(rechargeRecords.getAppUserId());
+ tAppUser.setPlayPaiCoins(null == tAppUser.getPlayPaiCoins()? rechargeRecords.getPlayPaiCoins(): tAppUser.getPlayPaiCoins() +rechargeRecords.getPlayPaiCoins() );
+ tappMapper.updateById(tAppUser);
+ break;
+ }
+
+
break;
--
Gitblit v1.7.1