From 41ae811e8adb958f4aa77ae2f78a1fcbde961963 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Mon, 25 Sep 2023 17:50:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BF=9D=E8=AF=81=E9=87=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/listener/paySuccessMargin.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/listener/paySuccessMargin.php b/app/listener/paySuccessMargin.php
index 535db236..1980fc0e 100644
--- a/app/listener/paySuccessMargin.php
+++ b/app/listener/paySuccessMargin.php
@@ -22,15 +22,15 @@ class paySuccessMargin
                 'pay_time' => date('Y-m-d H:i:s')
             ]);
             $merchantInfo = Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->find();
-            $marginAmount = (float)$merchantInfo['margin'] + (float)$marginInfo['total_price'];
+            $paidMarginAmount = (float)$merchantInfo['paid_margin'] + (float)$marginInfo['total_price'];
+            Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->update([
+                'paid_margin' => $paidMarginAmount
+            ]);
+            $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
             ]);
-            $paidAmount = (float)$merchantInfo['paid_margin'] - (float)$marginInfo['total_price'];
-            Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->update([
-                'paid_margin' => $paidAmount
-            ]);
-            if ($paidAmount <= 0) {
+            if ($marginAmount <= 0) {
                 Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->update([
                     'is_margin' => 10
                 ]);