From 95cd3876fd9636c83008d9dda2ceb6ac57580351 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Fri, 28 Jun 2024 11:29:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=AC=BE=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=8F=98=E5=8C=96=E5=89=8D=E5=90=8E=E7=9A=84?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/logic/CapitalFlowLogic.php | 8 ++++----
 app/common/logic/PayNotifyLogic.php   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/common/logic/CapitalFlowLogic.php b/app/common/logic/CapitalFlowLogic.php
index 79be1a48f..361ee124c 100644
--- a/app/common/logic/CapitalFlowLogic.php
+++ b/app/common/logic/CapitalFlowLogic.php
@@ -39,8 +39,8 @@ class CapitalFlowLogic extends BaseLogic
         $model->link_id = $linkId;
         $model->amount = $amount;
         if($type){
-            $model->before_balance = $this->user['now_money'];
-            $model->balance = $this->user['now_money'];
+            $model->before_balance = $this->user['purchase_funds'];
+            $model->balance =  bcsub($this->user['purchase_funds'], $amount, 2);
         }else{
             $model->before_balance = $this->user['now_money'];
             $model->balance = bcadd($this->user['now_money'], $amount, 2);
@@ -73,8 +73,8 @@ class CapitalFlowLogic extends BaseLogic
         $model->link_id = $linkId;
         $model->amount = $amount;
          if($payType == OrderEnum::BALANCE_PAYMEN_NO){
-            $model->before_balance = $this->user['now_money'];
-            $model->balance = $this->user['now_money'];
+            $model->before_balance = $this->user['purchase_funds'];
+            $model->balance =  bcsub($this->user['purchase_funds'], $amount, 2);
          }else{
              $model->before_balance = $this->user['now_money'];
              $model->balance = bcsub($this->user['now_money'], $amount, 2);
diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php
index 2d4ad7b0e..ec4df291c 100644
--- a/app/common/logic/PayNotifyLogic.php
+++ b/app/common/logic/PayNotifyLogic.php
@@ -650,7 +650,7 @@ class PayNotifyLogic extends BaseLogic
         $user = User::where('id', $uid)->findOrEmpty();
         //用户的财务add
         $capitalFlowDao = new CapitalFlowLogic($user);
-        $capitalFlowDao->userIncome('user_balance_recharge', 'user_recharge', $order['id'], $price);
+        $capitalFlowDao->userIncome('user_balance_recharge', 'user_recharge', $order['id'], $price,[],1);
 
         if ($user->isEmpty()) {
             return true;