From 69e56e0dbc2a57d9d3b63ac850bd95a4cdf4e9fb Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Tue, 21 May 2024 16:15:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E4=BE=9B=E5=BA=94=E5=95=86\?=
 =?UTF-8?q?=E7=BB=8F=E9=94=80=E5=95=86=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=B7=B2=E5=AE=A1=E6=A0=B8=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/lists/merchant/MerchantLists.php | 2 +-
 app/admin/lists/supplier/SupplierLists.php | 2 +-
 app/admin/logic/merchant/MerchantLogic.php | 8 ++++----
 app/admin/logic/supplier/SupplierLogic.php | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/admin/lists/merchant/MerchantLists.php b/app/admin/lists/merchant/MerchantLists.php
index 3b505ff..0903dfd 100644
--- a/app/admin/lists/merchant/MerchantLists.php
+++ b/app/admin/lists/merchant/MerchantLists.php
@@ -44,7 +44,7 @@ class MerchantLists extends BaseAdminDataLists implements ListsSearchInterface
      */
     public function lists(): array
     {
-        return Merchant::where($this->searchWhere)->withoutField(['update_time','delete_time'])
+        return Merchant::where($this->searchWhere)->where('status',1)->withoutField(['update_time','delete_time'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['mer_id' => 'desc'])
             ->select()->each(function($data){
diff --git a/app/admin/lists/supplier/SupplierLists.php b/app/admin/lists/supplier/SupplierLists.php
index dcd374f..5428fd4 100644
--- a/app/admin/lists/supplier/SupplierLists.php
+++ b/app/admin/lists/supplier/SupplierLists.php
@@ -44,7 +44,7 @@ class SupplierLists extends BaseAdminDataLists implements ListsSearchInterface
      */
     public function lists(): array
     {
-        return Supplier::where($this->searchWhere)->withoutField(['update_time','delete_time'])
+        return Supplier::where($this->searchWhere)->where('status',1)->withoutField(['update_time','delete_time'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()->each(function($data){
diff --git a/app/admin/logic/merchant/MerchantLogic.php b/app/admin/logic/merchant/MerchantLogic.php
index 3afcefa..a927e2a 100644
--- a/app/admin/logic/merchant/MerchantLogic.php
+++ b/app/admin/logic/merchant/MerchantLogic.php
@@ -175,12 +175,12 @@ class MerchantLogic extends BaseLogic
                     'mark'=>$params['mark']??'',
                     'apply_status'=>-1
                 ];
+	            Merchant::where('mer_id', $params['mer_id'])->update([
+		            'status' => 0,
+	            ]);
                 Db::name('user_auth_shop')->where('id',$params['apply_id'])->update($data);
-
             }
-            Merchant::where('mer_id', $params['mer_id'])->update([
-                'status' => $params['status'],
-            ]);
+            
 	        if(!empty($apply_info['jg_register_id'])){
 		        (new JgPushService()) -> sendMsg($apply_info['jg_register_id'],'您的经销入驻请求审核'.($params['status']==1?'通过':'被拒绝'),'/pages/bindDistribution/index');
 	        }
diff --git a/app/admin/logic/supplier/SupplierLogic.php b/app/admin/logic/supplier/SupplierLogic.php
index 24e0c6f..10112bd 100644
--- a/app/admin/logic/supplier/SupplierLogic.php
+++ b/app/admin/logic/supplier/SupplierLogic.php
@@ -122,12 +122,12 @@ class SupplierLogic extends BaseLogic
                     'mark'=>$params['mark']??'',
                     'apply_status'=>-1
                 ];
+	            Supplier::where('id', $params['id'])->update([
+		            'status' => 0,
+	            ]);
                 Db::name('user_auth_shop')->where('id',$params['apply_id'])->update($data);
-
             }
-            Supplier::where('id', $params['id'])->update([
-                'status' => $params['status'],
-            ]);
+            
 			if(!empty($apply_info['jg_register_id'])){
 				(new JgPushService()) -> sendMsg($apply_info['jg_register_id'],'您的供应入驻请求审核'.($params['status']==1?'通过':'被拒绝'),'/pages/bindSupplier/index');
 			}