From bc5e7dff68eb21f69cab2878fd1fe006550491e6 Mon Sep 17 00:00:00 2001
From: liuxiaoquan <q8197264@126.com>
Date: Thu, 16 Mar 2023 12:05:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/merchant/system/merchant/MerchantIntention.php  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/admin/controller/merchant/system/merchant/MerchantIntention.php b/app/admin/controller/merchant/system/merchant/MerchantIntention.php
index 7b28b42..86a3e58 100644
--- a/app/admin/controller/merchant/system/merchant/MerchantIntention.php
+++ b/app/admin/controller/merchant/system/merchant/MerchantIntention.php
@@ -89,13 +89,14 @@ class MerchantIntention extends BaseController
     public function SwitchStatus()
     {
         $params = get_params(['status','fail_msg','create_mer','id']);
+        $params['status'] = $params['status'] == 1 ? 1 : 2;
         $id = $params['id'];
         
         //创建
         if (!$this->intention->GetWhereCount(['mer_intention_id' => $id, 'is_del' => 0]))
             return to_assign(1,'数据不存在');
+
         try {
-            $params['status'] = $params['status'] == 1 ? 1 : 2;
             $this->intention->updateStatus($id, $params);
         }catch(ValidateException $e){
             return to_assign(1, $e->getError());