From e6642a6b41a7b1b313abd2bb1d12eda3df4933af Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Tue, 19 Sep 2023 11:23:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=95=86=E6=88=B7=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/Auth.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php
index c0e7dbce..ffdbacb5 100644
--- a/app/controller/api/Auth.php
+++ b/app/controller/api/Auth.php
@@ -1372,8 +1372,9 @@ class Auth extends BaseController
             $repository->updateStatus($id, $data);
         } else {
             //商户交易申请
-            Db::name('merchant_integntion')->where('mer_intention_id', $intentionId)->where('type', 2)->update(['status' => ($status == 1 ? 1 : 2)]);
-            Db::name('merchant')->where('mer_intention_id', $id)->where('status', 1)->update(['business_status' => ($status == 1 ? 2 : 3)]);
+            Db::name('merchant_integntion')->where('mer_intention_id', $id)->where('type', 2)->update(['status' => ($status == 1 ? 1 : 2)]);
+            $merId = Db::name('merchant_integntion')->where('mer_intention_id', $id)->where('type', 2)->value('mer_id', 0);
+            Db::name('merchant')->where('mer_id', $merId)->where('status', 1)->update(['business_status' => ($status == 1 ? 2 : 3)]);
         }
         
         return app('json')->success('同步成功');