From 1ea3a0ab14f541e41e358866d2c75131f6673fed Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sun, 9 Jun 2024 20:14:21 +0800
Subject: [PATCH] =?UTF-8?q?feat(OrderLogic,=20CapitalFlowLogic):=20?=
 =?UTF-8?q?=E9=87=8D=E6=9E=84=E4=BD=99=E9=A2=9D=E6=94=AF=E4=BB=98=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=EF=BC=8C=E4=BC=98=E5=8C=96=E5=BA=93=E5=AD=98=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E4=B8=8E=E7=94=A8=E6=88=B7=E4=BD=99=E9=A2=9D=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/logic/order/OrderLogic.php    | 30 ---------------------------
 app/common/logic/CapitalFlowLogic.php | 10 ++++-----
 2 files changed, 5 insertions(+), 35 deletions(-)

diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php
index 8f84b06a4..ca2c98f48 100644
--- a/app/api/logic/order/OrderLogic.php
+++ b/app/api/logic/order/OrderLogic.php
@@ -254,36 +254,6 @@ class OrderLogic extends BaseLogic
     }
 
 
-    /**
-     * 余额订单支付
-     * @param User $user
-     * @param $order
-     * @return bool
-     * @throws Exception
-     * @throws ValidateException
-     */
-    static public function payBalance(User $user, $order)
-    {
-        if ($user['now_money'] < $order['pay_price']) {
-            self::setError('余额不足，请更换支付方式');
-            return false;
-        }
-        Db::startTrans();
-        try {
-            $user->now_money = bcsub($user->now_money, $order['pay_price'], 2);
-            $user->save();
-            $capitalFlowDao = new CapitalFlowLogic($user);
-            $capitalFlowDao->userExpense('user_order_pay', 'order', $order['id'], $order['pay_price']);
-            Db::commit();
-            return true;
-        } catch (\Exception $e) {
-            Db::rollback();
-            Log::error('余额支付失败' . $e->getMessage() . '。line:' . $e->getLine() . '。file:' . $e->getFile());
-            self::setError('余额支付失败' . $e->getMessage());
-            return false;
-        }
-    }
-
     /**
      * @notes 订单支付成功
      * @param $order 订单
diff --git a/app/common/logic/CapitalFlowLogic.php b/app/common/logic/CapitalFlowLogic.php
index 4f11acdcc..e8ac3a513 100644
--- a/app/common/logic/CapitalFlowLogic.php
+++ b/app/common/logic/CapitalFlowLogic.php
@@ -63,13 +63,13 @@ class CapitalFlowLogic extends BaseLogic
         $model->link_type = $linkType;
         $model->link_id = $linkId;
         $model->amount = $amount;
-        if($payType == 1){
+        // if($payType == 1){
             $model->before_balance = $this->user['now_money'];
             $model->balance = $this->user['now_money'];
-        }else{
-            $model->before_balance = $this->user['now_money'];
-            $model->balance = bcsub($this->user['now_money'], $amount, 2);
-        }
+        // }else{
+        //     $model->before_balance = $this->user['now_money'];
+        //     $model->balance = bcsub($this->user['now_money'], $amount, 2);
+        // }
         $model->create_time = date('Y-m-d H:i:s');
         $model->type = 'out';
         $model->title = $this->getTitle($category, $amount);