From 3444605298a981f8db627d8a4055bc7440beddcf Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 11 十一月 2024 20:21:18 +0800
Subject: [PATCH] 代码提交
---
xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserWalletRecordController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 219445a..b7d08d6 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
@@ -297,11 +297,11 @@
orderDetailVO.setAmount(byId.getAmount());
orderDetailVO.setRemark(one.getRemark());
if (one.getCommissionId()!=null){
- AppUser appUserById = appUserService.getById(one.getCommissionId());
+ AppUser appUserById = appUserService.getById(one.getAppUserId());
orderDetailVO.setUserName(appUserById.getNickname());
orderDetailVO.setAvatar(appUserById.getAvatar());
}
- return R.ok(new OrderDetailVO());
+ return R.ok(orderDetailVO);
}
}else if (byId.getReason().equals("提现回退")){
AppUserWithdraw byId1 = appUserWithdrawService.getById(byId.getOrderId());
@@ -311,7 +311,7 @@
orderDetailVO.setAmount(byId1.getAmount());
orderDetailVO.setChangeType(byId.getChangeType());
orderDetailVO.setPaymentTime(byId1.getUpdateTime());
- return R.ok(new OrderDetailVO());
+ return R.ok(orderDetailVO);
}else if (byId.getReason().contains("课程")){
Order data = remoteOrderService.getOrderById(byId.getOrderId()).getData();
if (data!=null){
@@ -322,6 +322,8 @@
orderDetailVO.setChangeType(byId.getChangeType());
orderDetailVO.setPaymentTime(data.getPaymentTime());
}
+ return R.ok(orderDetailVO);
+
} else if (byId.getReason().contains("疗愈")) {
Order data = remoteOrderService.getOrderById(byId.getOrderId()).getData();
if (data!=null){
@@ -332,6 +334,8 @@
orderDetailVO.setChangeType(2);
orderDetailVO.setPaymentTime(data.getPaymentTime());
}
+ return R.ok(orderDetailVO);
+
}
}
return R.ok(orderDetailVO);
--
Gitblit v1.7.1