From 1cd6c3e8ee9326c52ac79805193db1d32b390055 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 09 十一月 2024 18:41:07 +0800
Subject: [PATCH] 代码提交
---
xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserWalletRecordController.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 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 567e37c..01f10e7 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
@@ -202,6 +202,7 @@
if (byId.getReason().equals("提现")){
AppUserWithdraw byId1 = appUserWithdrawService.getById(byId.getOrderId());
orderDetailVO.setType("提现");
+ orderDetailVO.setRemark("银行卡提现");
orderDetailVO.setPayOrderNo(byId1.getSerialNo());
orderDetailVO.setWithdrawType(byId1.getWithdrawType());
orderDetailVO.setAmount(byId1.getAmount());
@@ -213,7 +214,11 @@
orderDetailVO.setType("充值");
orderDetailVO.setPayType(one.getPayType());
orderDetailVO.setPayOrderNo(one.getPayOrderNo());
- orderDetailVO.setRemark(one.getRemark());
+ if (one.getPayType()==1){
+ orderDetailVO.setRemark("微信支付");
+ }else if (one.getPayType()==2){
+ orderDetailVO.setRemark("支付宝支付");
+ }
orderDetailVO.setChangeType(byId.getChangeType());
orderDetailVO.setAmount(byId.getAmount());
orderDetailVO.setPaymentTime(one.getPaymentTime());
@@ -227,7 +232,7 @@
orderDetailVO.setPaymentTime(byId.getCreateTime());
orderDetailVO.setChangeType(byId.getChangeType());
orderDetailVO.setAmount(byId.getAmount());
- orderDetailVO.setRemark(one.getRemark());
+ orderDetailVO.setRemark("分佣收益");
if (one.getCommissionId()!=null){
AppUser appUserById = appUserService.getById(one.getCommissionId());
orderDetailVO.setUserName(appUserById.getNickname());
@@ -277,7 +282,7 @@
if (byId.getChildAppUserId() == null && one!=null){
orderDetailVO.setType("充值");
orderDetailVO.setPayType(one.getPayType());
- orderDetailVO.setPayOrderNo(one.getPayOrderNo());
+ orderDetailVO.setPayOrderNo(one.getBizOrderNo());
orderDetailVO.setRemark(one.getRemark());
orderDetailVO.setChangeType(byId.getChangeType());
orderDetailVO.setAmount(byId.getAmount());
@@ -288,7 +293,7 @@
Order one = remoteOrderService.getOrderById(byId.getOrderId()).getData();
if (byId.getChildAppUserId()!=null && one!=null){
orderDetailVO.setType("分佣");
- orderDetailVO.setPayOrderNo(one.getPayOrderNo());
+ orderDetailVO.setPayOrderNo(one.getBizOrderNo());
orderDetailVO.setPaymentTime(byId.getCreateTime());
orderDetailVO.setChangeType(byId.getChangeType());
orderDetailVO.setAmount(byId.getAmount());
@@ -314,7 +319,7 @@
if (data!=null){
Course data1 = remoteCourseService.getCourseById(data.getBusinessId()).getData();
orderDetailVO.setType("课程购买");
- orderDetailVO.setPayOrderNo(data.getPayOrderNo());
+ orderDetailVO.setPayOrderNo(data.getBizOrderNo());
orderDetailVO.setAmount(data.getBalance());
orderDetailVO.setChangeType(byId.getChangeType());
orderDetailVO.setPaymentTime(data.getPaymentTime());
@@ -324,7 +329,7 @@
if (data!=null){
Meditation data1 = remoteMeditationService.getMeditationById(data.getBusinessId()).getData();
orderDetailVO.setType("疗愈购买");
- orderDetailVO.setPayOrderNo(data.getPayOrderNo());
+ orderDetailVO.setPayOrderNo(data.getBizOrderNo());
orderDetailVO.setAmount(data.getBalance());
orderDetailVO.setChangeType(2);
orderDetailVO.setPaymentTime(data.getPaymentTime());
--
Gitblit v1.7.1