From 0c51a577db337520452022d9d6a22b720ef858d4 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 31 十二月 2024 14:13:01 +0800
Subject: [PATCH] 全部代码、数据库提交
---
xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserWalletRecordController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserWalletRecordController.java b/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserWalletRecordController.java
index 7f89cde..3152ce1 100644
--- a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserWalletRecordController.java
+++ b/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserWalletRecordController.java
@@ -147,7 +147,18 @@
return R.ok(empty);
}
for (AppUserWalletRecord record : page.getRecords()) {
- record.setId(record.getId());
+ if (record.getReason().equals("后台退款")){
+ record.setId(record.getOrderId());
+ }
+ if (record.getReason().contains("课程")){
+ record.setId(record.getOrderId());
+ }
+ if (record.getReason().contains("疗愈")){
+ record.setId(record.getOrderId());
+ }
+ if (record.getReason().contains("会员")){
+ record.setId(record.getOrderId());
+ }
}
return R.ok(PageDTO.of(page, OrderListVO.class));
}
@@ -208,7 +219,7 @@
orderDetailVO.setWithdrawType(byId1.getWithdrawType());
orderDetailVO.setAmount(byId1.getAmount());
orderDetailVO.setChangeType(byId.getChangeType());
- orderDetailVO.setPaymentTime(byId1.getUpdateTime());
+ orderDetailVO.setPaymentTime(byId1.getCreateTime());
}else if (byId.getReason().equals("充值")){
Order one = remoteOrderService.getOrderById(byId.getOrderId()).getData();
if (one!=null){
--
Gitblit v1.7.1