From 353cf91d3679e68d9b8c07652e4f7791d606dbd4 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 15 十一月 2024 15:14:39 +0800
Subject: [PATCH] 代码提交
---
xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserWalletRecordController.java | 43 +++++++++++++++++++++++++++++++------------
1 files changed, 31 insertions(+), 12 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..6409836 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());
@@ -218,6 +218,8 @@
orderDetailVO.setRemark("微信支付");
}else if (one.getPayType()==2){
orderDetailVO.setRemark("支付宝支付");
+ }else if (one.getPayType() == 3){
+ orderDetailVO.setRemark("IOS内购");
}
orderDetailVO.setChangeType(byId.getChangeType());
orderDetailVO.setAmount(byId.getAmount());
@@ -238,7 +240,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 +250,8 @@
orderDetailVO.setAmount(byId1.getAmount());
orderDetailVO.setChangeType(byId.getChangeType());
orderDetailVO.setPaymentTime(byId1.getUpdateTime());
- return R.ok(new OrderDetailVO());
+ orderDetailVO.setRemark(byId1.getReason());
+ return R.ok(orderDetailVO);
}
}
@@ -277,9 +280,9 @@
orderDetailVO.setAmount(byId1.getAmount());
orderDetailVO.setChangeType(byId.getChangeType());
orderDetailVO.setPaymentTime(byId1.getUpdateTime());
+ orderDetailVO.setRemark("银行卡提现");
}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());
@@ -287,8 +290,15 @@
orderDetailVO.setChangeType(byId.getChangeType());
orderDetailVO.setAmount(byId.getAmount());
orderDetailVO.setPaymentTime(one.getPaymentTime());
- return R.ok(orderDetailVO);
- }
+ if (one.getPayType()==1){
+ orderDetailVO.setRemark("微信支付");
+ }else if (one.getPayType()==2){
+ orderDetailVO.setRemark("支付宝支付");
+ }else if (one.getPayType() == 3){
+ orderDetailVO.setRemark("IOS内购");
+ }
+
+ return R.ok(orderDetailVO);
}else if (byId.getReason().equals("分佣收益")){
Order one = remoteOrderService.getOrderById(byId.getOrderId()).getData();
if (byId.getChildAppUserId()!=null && one!=null){
@@ -298,12 +308,13 @@
orderDetailVO.setChangeType(byId.getChangeType());
orderDetailVO.setAmount(byId.getAmount());
orderDetailVO.setRemark(one.getRemark());
+ orderDetailVO.setRemark("分佣收益");
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 +324,8 @@
orderDetailVO.setAmount(byId1.getAmount());
orderDetailVO.setChangeType(byId.getChangeType());
orderDetailVO.setPaymentTime(byId1.getUpdateTime());
- return R.ok(new OrderDetailVO());
+ orderDetailVO.setRemark(byId1.getReason());
+ return R.ok(orderDetailVO);
}else if (byId.getReason().contains("课程")){
Order data = remoteOrderService.getOrderById(byId.getOrderId()).getData();
if (data!=null){
@@ -323,7 +335,11 @@
orderDetailVO.setAmount(data.getBalance());
orderDetailVO.setChangeType(byId.getChangeType());
orderDetailVO.setPaymentTime(data.getPaymentTime());
+ if (data1!=null)orderDetailVO.setRemark("课程购买【"+data1.getCourseTitle()+"】");
+
}
+ return R.ok(orderDetailVO);
+
} else if (byId.getReason().contains("疗愈")) {
Order data = remoteOrderService.getOrderById(byId.getOrderId()).getData();
if (data!=null){
@@ -333,7 +349,10 @@
orderDetailVO.setAmount(data.getBalance());
orderDetailVO.setChangeType(2);
orderDetailVO.setPaymentTime(data.getPaymentTime());
+ if (data1!=null)orderDetailVO.setRemark("疗愈购买【"+data1.getMeditationTitle()+"】");
}
+ return R.ok(orderDetailVO);
+
}
}
return R.ok(orderDetailVO);
--
Gitblit v1.7.1