From c5857a50d688d0c42b3893854e6f30dc45e61ca9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 11 十一月 2024 22:32:12 +0800
Subject: [PATCH] 代码提交
---
xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserWalletRecordController.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 01f10e7..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
@@ -279,7 +279,6 @@
orderDetailVO.setPaymentTime(byId1.getUpdateTime());
}else if (byId.getReason().equals("充值")){
Order one = remoteOrderService.getOrderById(byId.getOrderId()).getData();
- if (byId.getChildAppUserId() == null && one!=null){
orderDetailVO.setType("充值");
orderDetailVO.setPayType(one.getPayType());
orderDetailVO.setPayOrderNo(one.getBizOrderNo());
@@ -288,7 +287,6 @@
orderDetailVO.setAmount(byId.getAmount());
orderDetailVO.setPaymentTime(one.getPaymentTime());
return R.ok(orderDetailVO);
- }
}else if (byId.getReason().equals("分佣收益")){
Order one = remoteOrderService.getOrderById(byId.getOrderId()).getData();
if (byId.getChildAppUserId()!=null && one!=null){
@@ -299,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());
@@ -313,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){
@@ -324,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){
@@ -334,6 +334,8 @@
orderDetailVO.setChangeType(2);
orderDetailVO.setPaymentTime(data.getPaymentTime());
}
+ return R.ok(orderDetailVO);
+
}
}
return R.ok(orderDetailVO);
--
Gitblit v1.7.1