From abead6ba26a8a426cdcb7fe8c904048968ea1edb Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Mon, 25 Sep 2023 13:58:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=9B=9E=E8=B0=83=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/listener/paySuccessMargin.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/listener/paySuccessMargin.php b/app/listener/paySuccessMargin.php
index 701e794c..bc4c208f 100644
--- a/app/listener/paySuccessMargin.php
+++ b/app/listener/paySuccessMargin.php
@@ -21,10 +21,16 @@ class paySuccessMargin
                 'paid' => 1,
                 'pay_time' => date('Y-m-d H:i:s')
             ]);
-            Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->inc('margin', (float)$marginInfo['total_price']);
-            Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->dec('recharge_margin', (float)$marginInfo['total_price']);
             $merchantInfo = Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->find();
-            if ($merchantInfo['recharge_margin'] <= 0) {
+            $marginAmount = (float)$merchantInfo['margin'] + (float)$marginInfo['total_price'];
+            Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->update([
+                'margin' => $marginAmount
+            ]);
+            $rechargeAmount = (float)$marginInfo['recharge_margin'] - (float)$merchantInfo['total_price'];
+            Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->update([
+                'recharge_margin' => $rechargeAmount
+            ]);
+            if ($rechargeAmount <= 0) {
                 Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->update([
                     'is_margin' => 10
                 ]);