From 9823c85286da0041a729fe58cb38a62ff33fdced Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 11 十一月 2024 21:00:54 +0800
Subject: [PATCH] 代码提交

---
 xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/client/ClientOrderController.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/client/ClientOrderController.java b/xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/client/ClientOrderController.java
index a40c758..3d61e14 100644
--- a/xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/client/ClientOrderController.java
+++ b/xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/client/ClientOrderController.java
@@ -118,6 +118,13 @@
         if (byId==null){
             return R.fail("订单失效");
         }
+        if (byId.getGiveUserId()!=null){
+            AppUser data1 = remoteAppUserService.getAppUserById(byId.getGiveUserId() + "").getData();
+            payOrderVO.setPhone(data1.getCellPhone());
+        }
+
+        AppUser data1 = remoteAppUserService.getAppUserById(byId.getAppUserId() + "").getData();
+        payOrderVO.setBalance(data1.getBalance());
         payOrderVO.setOrderId(id);
         if (byId.getOrderFrom()==1){
             Meditation data = remoteMeditationService.getMeditationById(byId.getBusinessId()).getData();
@@ -551,6 +558,8 @@
                         .ne(OrderPaymentRecord::getPaymentType, 4).one();
                 if (one2!=null){
                     one2.setPaymentStatus(2);
+                    // 扣除用户余额
+                    Object data = remoteAppUserService.deleteBalance(one.getAppUserId() + "", one2.getPayAmount() + "").getData();
                     orderPaymentRecordService.updateById(one2);
                 }
                 // 实际支付金额

--
Gitblit v1.7.1