From ea73e0fcc705bd95c35ef95f17f98f482475a0dd Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 14 十一月 2024 13:50:52 +0800
Subject: [PATCH] 代码提交

---
 xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserWalletRecordController.java |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 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..37df049 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
@@ -91,8 +91,8 @@
         String endTime = null;
         if (org.springframework.util.StringUtils.hasLength(dto.getTime())){
             String[] split = dto.getTime().split(" - ");
-            startTime = split[0]+"00:00:00";
-            endTime = split[1]+"23:59:59";
+            startTime = split[0]+" 00:00:00";
+            endTime = split[1]+" 23:59:59";
         }
         String userId = dto.getUid();
         LambdaQueryWrapper<AppUser> appUserWalletRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -147,7 +147,7 @@
             return R.ok(empty);
         }
         for (AppUserWalletRecord record : page.getRecords()) {
-            record.setId(record.getOrderId());
+            record.setId(record.getId());
         }
         return R.ok(PageDTO.of(page, OrderListVO.class));
     }
@@ -210,7 +210,7 @@
                 orderDetailVO.setPaymentTime(byId1.getUpdateTime());
             }else if (byId.getReason().equals("充值")){
                 Order one = remoteOrderService.getOrderById(byId.getOrderId()).getData();
-                if (byId.getChildAppUserId() == null && one!=null){
+                if (one!=null){
                     orderDetailVO.setType("充值");
                     orderDetailVO.setPayType(one.getPayType());
                     orderDetailVO.setPayOrderNo(one.getPayOrderNo());
@@ -238,7 +238,7 @@
                         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());
@@ -248,7 +248,7 @@
                 orderDetailVO.setAmount(byId1.getAmount());
                 orderDetailVO.setChangeType(byId.getChangeType());
                 orderDetailVO.setPaymentTime(byId1.getUpdateTime());
-                return R.ok(new OrderDetailVO());
+                return R.ok(orderDetailVO);
 
             }
         }
@@ -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