From dd663d0ac783755d889e270eee57ee58630c88c8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 28 二月 2025 17:46:52 +0800
Subject: [PATCH] 冥想2.0新增代码
---
xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserWalletRecordController.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 51 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 37df049..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));
}
@@ -178,6 +189,7 @@
appUserWalletRecordLambdaQueryWrapper.eq(AppUserWalletRecord::getChangeType, state-1);
}
appUserWalletRecordLambdaQueryWrapper.eq(AppUserWalletRecord::getAppUserId, userId);
+ appUserWalletRecordLambdaQueryWrapper.ne(AppUserWalletRecord::getAmount, 0);
appUserWalletRecordLambdaQueryWrapper.orderByDesc(BaseModel::getCreateTime);
Page<AppUserWalletRecord> page = walletRecordService
.page(new Page<>(pageCurr, pageSize),appUserWalletRecordLambdaQueryWrapper);
@@ -207,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){
@@ -218,6 +230,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());
@@ -248,6 +262,7 @@
orderDetailVO.setAmount(byId1.getAmount());
orderDetailVO.setChangeType(byId.getChangeType());
orderDetailVO.setPaymentTime(byId1.getUpdateTime());
+ orderDetailVO.setRemark(byId1.getReason());
return R.ok(orderDetailVO);
}
@@ -277,6 +292,7 @@
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();
orderDetailVO.setType("充值");
@@ -286,7 +302,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){
@@ -296,6 +320,7 @@
orderDetailVO.setChangeType(byId.getChangeType());
orderDetailVO.setAmount(byId.getAmount());
orderDetailVO.setRemark(one.getRemark());
+ orderDetailVO.setRemark("分佣收益");
if (one.getCommissionId()!=null){
AppUser appUserById = appUserService.getById(one.getAppUserId());
orderDetailVO.setUserName(appUserById.getNickname());
@@ -311,6 +336,7 @@
orderDetailVO.setAmount(byId1.getAmount());
orderDetailVO.setChangeType(byId.getChangeType());
orderDetailVO.setPaymentTime(byId1.getUpdateTime());
+ orderDetailVO.setRemark(byId1.getReason());
return R.ok(orderDetailVO);
}else if (byId.getReason().contains("课程")){
Order data = remoteOrderService.getOrderById(byId.getOrderId()).getData();
@@ -321,6 +347,8 @@
orderDetailVO.setAmount(data.getBalance());
orderDetailVO.setChangeType(byId.getChangeType());
orderDetailVO.setPaymentTime(data.getPaymentTime());
+ if (data1!=null)orderDetailVO.setRemark("课程购买【"+data1.getCourseTitle()+"】");
+
}
return R.ok(orderDetailVO);
@@ -333,8 +361,28 @@
orderDetailVO.setAmount(data.getBalance());
orderDetailVO.setChangeType(2);
orderDetailVO.setPaymentTime(data.getPaymentTime());
+ if (data1!=null)orderDetailVO.setRemark("疗愈购买【"+data1.getMeditationTitle()+"】");
}
return R.ok(orderDetailVO);
+ }else if (byId.getReason().contains("退款")){
+ Order data = remoteOrderService.getOrderById(byId.getOrderId()).getData();
+ if (data!=null){
+ orderDetailVO.setType("后台退款");
+ orderDetailVO.setPayOrderNo(data.getRefundCode());
+ orderDetailVO.setAmount(byId.getAmount());
+ orderDetailVO.setChangeType(1);
+ orderDetailVO.setPaymentTime(data.getRefundTime());
+ switch (data.getOrderFrom()){
+ case 1:
+ Meditation data1 = remoteMeditationService.getMeditationById(data.getBusinessId()).getData();
+ if (data1!=null)orderDetailVO.setRemark("疗愈购买【"+data1.getMeditationTitle()+"】");
+ break;
+ case 2:
+ Course data2 = remoteCourseService.getCourseById(data.getBusinessId()).getData();
+ if (data2!=null)orderDetailVO.setRemark("课程购买【"+data2.getCourseTitle()+"】");
+ break;
+ }
+ }
}
}
--
Gitblit v1.7.1