From e57fc9cc8438c0308319411d6716b0f1faa0fe19 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 18 May 2024 16:16:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/logic/merchant/MerchantLogic.php       | 1 +
 app/admin/logic/supplier/SupplierLogic.php       | 1 +
 app/admin/validate/merchant/MerchantValidate.php | 2 +-
 app/admin/validate/supplier/SupplierValidate.php | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/admin/logic/merchant/MerchantLogic.php b/app/admin/logic/merchant/MerchantLogic.php
index 4854725..391c7a2 100644
--- a/app/admin/logic/merchant/MerchantLogic.php
+++ b/app/admin/logic/merchant/MerchantLogic.php
@@ -155,6 +155,7 @@ class MerchantLogic extends BaseLogic
             ];
             $res1=UserLogic::add($user);
             if($res1==false){
+                Db::rollback();
                 throw new BusinessException(UserLogic::getError(), 0);
             }
             if($params['status']==1){
diff --git a/app/admin/logic/supplier/SupplierLogic.php b/app/admin/logic/supplier/SupplierLogic.php
index cc1229c..ce17302 100644
--- a/app/admin/logic/supplier/SupplierLogic.php
+++ b/app/admin/logic/supplier/SupplierLogic.php
@@ -97,6 +97,7 @@ class SupplierLogic extends BaseLogic
             
             $res1=UserLogic::add($user);
             if($res1==false){
+                Db::rollback();
                 throw new BusinessException(UserLogic::getError(), 0);
             }
             if($params['status']==1){
diff --git a/app/admin/validate/merchant/MerchantValidate.php b/app/admin/validate/merchant/MerchantValidate.php
index f281761..f3a456e 100644
--- a/app/admin/validate/merchant/MerchantValidate.php
+++ b/app/admin/validate/merchant/MerchantValidate.php
@@ -70,7 +70,7 @@ class MerchantValidate extends BaseValidate
    */
   public function sceneStatus()
   {
-    return $this->only(['mer_id', 'status'])->append('apply_id', 'require');
+    return $this->only(['mer_id', 'status'])->append('apply_id', 'require')->append('service_phone','require');
   }
 
   /**
diff --git a/app/admin/validate/supplier/SupplierValidate.php b/app/admin/validate/supplier/SupplierValidate.php
index 9f6f907..23400a9 100644
--- a/app/admin/validate/supplier/SupplierValidate.php
+++ b/app/admin/validate/supplier/SupplierValidate.php
@@ -60,7 +60,7 @@ class SupplierValidate extends BaseValidate
      */
     public function sceneStatus()
     {
-        return $this->only(['id', 'status'])->append('apply_id', 'require');
+        return $this->only(['id', 'status'])->append('apply_id', 'require')->append('service_phone','require');
     }
 
     /**