diff --git a/app/admin/controller/merchat/MerchantController.php b/app/admin/controller/merchat/MerchantController.php
index 4f2cd4d..2be89ab 100644
--- a/app/admin/controller/merchat/MerchantController.php
+++ b/app/admin/controller/merchat/MerchantController.php
@@ -41,7 +41,7 @@ class MerchantController extends BaseAdminController
         $page_no = $this->request->get('page_no', 1);
         $page_size = $this->request->get('page_size', 15);
 
-        $data = Db::name('user_auth_shop')->where('type', 1)->page($page_no, $page_size)->select()->each(function ($item) {
+        $data = Db::name('user_auth_shop')->where('type', 1)->order('id desc')->page($page_no, $page_size)->select()->each(function ($item) {
             $data = Merchant::where('mer_id', $item['pid'])->find();
             $item['merchant'] = $data;
             $item['apply_id'] = $item['id'];
diff --git a/app/admin/controller/supplier/SupplierController.php b/app/admin/controller/supplier/SupplierController.php
index 2824bbb..e9019f6 100644
--- a/app/admin/controller/supplier/SupplierController.php
+++ b/app/admin/controller/supplier/SupplierController.php
@@ -38,7 +38,7 @@ class SupplierController extends BaseAdminController
         $page_no = $this->request->get('page_no', 1);
         $page_size = $this->request->get('page_size', 15);
 
-        $data = Db::name('user_auth_shop')->where('type', 2)->page($page_no, $page_size)->select()->each(function ($item) {
+        $data = Db::name('user_auth_shop')->where('type', 2)->order('id desc')->page($page_no, $page_size)->select()->each(function ($item) {
             $data = Supplier::where('id', $item['pid'])->find();
             $item['supplier'] = $data;
             $item['apply_id'] = $item['id'];
diff --git a/app/admin/logic/merchant/MerchantLogic.php b/app/admin/logic/merchant/MerchantLogic.php
index 391c7a2..3afcefa 100644
--- a/app/admin/logic/merchant/MerchantLogic.php
+++ b/app/admin/logic/merchant/MerchantLogic.php
@@ -3,6 +3,7 @@
 namespace app\admin\logic\merchant;
 
 use app\admin\logic\user\UserLogic;
+use app\admin\service\JgPushService;
 use app\common\model\merchant\Merchant;
 use app\common\logic\BaseLogic;
 use app\common\model\user\User;
@@ -58,14 +59,14 @@ class MerchantLogic extends BaseLogic
                 'financial_alipay' => $params['financial_alipay'] ?? '',
                 'financial_type' => $params['financial_type'] ?? '',
                 'data_json' => json_encode([
-                    'company_address' => $params['address'] ?? '',
-                    'company_nickname' => $params['nickname'] ?? '',
-                    'social_credit_code' => $params['social_credit_code'] ?? '',
-                    'company_name' => $params['company_name'] ?? '',
-                    'images' => $params['images'][0] ?? '',
+	                'company_address' => $params['address'] ?? '',
+	                'company_nickname' => $params['company_nickname'] ?? '',
+	                'social_credit_code' => $params['social_credit_code'] ?? '',
+	                'company_name' => $params['company_name'] ?? '',
+	                'images'=>$params['images'][0] ?? '',
                 ])
             ]);
-            Db::name('user_auth_shop')->insert(['pid'=>$res->id,'user_id'=>0,'shop_uid'=>$params['shop_user_id'],'status'=>0,'type'=>1,'create_time'=>time()]);
+            Db::name('user_auth_shop')->insert(['pid'=>$res->id,'user_id'=>0,'shop_uid'=>$params['shop_user_id'],'status'=>0,'type'=>1,'create_time'=>time(),'jg_register_id'=>$params['jg_register_id']]);
             Db::commit();
             return true;
         } catch (\Exception $e) {
@@ -115,11 +116,11 @@ class MerchantLogic extends BaseLogic
                 'financial_alipay' => $params['financial_alipay'] ?? '',
                 'financial_type' => $params['financial_type'] ?? '',
                 'data_json' => json_encode([
-                    'company_address' => $params['address'] ?? '',
-                    'company_nickname' => $params['nickname'] ?? '',
-                    'social_credit_code' => $params['social_credit_code'] ?? '',
-                    'company_name' => $params['company_name'] ?? '',
-                    'images' => $params['images'][0] ?? '',
+	                'company_address' => $params['address'] ?? '',
+	                'company_nickname' => $params['company_nickname'] ?? '',
+	                'social_credit_code' => $params['social_credit_code'] ?? '',
+	                'company_name' => $params['company_name'] ?? '',
+	                'images'=>$params['images'][0] ?? '',
                 ])
             ]);
 
@@ -140,25 +141,26 @@ class MerchantLogic extends BaseLogic
      */
     public static function status(array $params): bool
     {
+	    $apply_info = Db::name('user_auth_shop')->where('id',$params['apply_id'])->findOrEmpty();
         Db::startTrans();
         try {
-            $user=[
-               'real_name'=>$params['service_phone'],
-               'nickname' => '用户'.$params['service_phone'],
-                'account' => $params['service_phone'],
-                'mobile' => $params['service_phone'],
-                'password' => $params['service_phone'],
-                'sex' => 0,
-                'is_disable' => 0,
-                'user_money' => 0
-
-            ];
-            $res1=UserLogic::add($user);
-            if($res1==false){
-                Db::rollback();
-                throw new BusinessException(UserLogic::getError(), 0);
-            }
             if($params['status']==1){
+	            $user=[
+		            'real_name'=>$params['service_phone'],
+		            'nickname' => '用户'.$params['service_phone'],
+		            'account' => $params['service_phone'],
+		            'mobile' => $params['service_phone'],
+		            'password' => $params['service_phone'],
+		            'sex' => 0,
+		            'is_disable' => 0,
+		            'user_money' => 0
+	
+	            ];
+	            $res1=UserLogic::add($user);
+	            if($res1==false){
+		            Db::rollback();
+		            throw new BusinessException(UserLogic::getError(), 0);
+	            }
                 $data=[
                     'user_id'=>$res1['id'],
                     'status'=>1,
@@ -179,12 +181,13 @@ class MerchantLogic extends BaseLogic
             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');
+	        }
             Db::commit();
             return true;
         } catch (\Exception $e) {
             Db::rollback();
-            d($e);
-
             self::setError($e->getMessage());
             return false;
         }
diff --git a/app/admin/logic/supplier/SupplierLogic.php b/app/admin/logic/supplier/SupplierLogic.php
index 028a958..9a5e865 100644
--- a/app/admin/logic/supplier/SupplierLogic.php
+++ b/app/admin/logic/supplier/SupplierLogic.php
@@ -3,6 +3,7 @@
 namespace app\admin\logic\supplier;
 
 use app\admin\logic\user\UserLogic;
+use app\admin\service\JgPushService;
 use app\common\model\goods\GoodsLabel;
 use app\common\model\supplier\Supplier;
 use app\common\logic\BaseLogic;
@@ -62,13 +63,13 @@ class SupplierLogic extends BaseLogic
                 'financial_type' => $params['financial_type'] ?? '',
                 'data_json'=>json_encode([
                     'company_address' => $params['address'] ?? '',
-                    'company_nickname' => $params['nickname'] ?? '',
+                    'company_nickname' => $params['company_nickname'] ?? '',
                     'social_credit_code' => $params['social_credit_code'] ?? '',
                     'company_name' => $params['company_name'] ?? '',
                     'images'=>$params['images'][0] ?? '',
                     ])
             ]);
-            Db::name('user_auth_shop')->insert(['pid'=>$res->id,'user_id'=>0,'shop_uid'=>$params['shop_user_id'],'status'=>0,'type'=>2,'create_time'=>time()]);
+            Db::name('user_auth_shop')->insert(['pid'=>$res->id,'user_id'=>0,'shop_uid'=>$params['shop_user_id'],'status'=>0,'type'=>2,'create_time'=>time(),'jg_register_id'=>$params['jg_register_id']]);
             Db::commit();
             return true;
         } catch (\Exception $e) {
@@ -86,26 +87,26 @@ class SupplierLogic extends BaseLogic
      */
     public static function status(array $params): bool
     {
+		$apply_info = Db::name('user_auth_shop')->where('id',$params['apply_id'])->findOrEmpty();
         Db::startTrans();
         try {
-            $user=[
-               'real_name'=>$params['service_phone'],
-               'nickname' => '用户'.$params['service_phone'],
-                'account' => $params['service_phone'],
-                'mobile' => $params['service_phone'],
-                'password' => $params['service_phone'],
-                'sex' => 0,
-                'is_disable' => 0,
-                'user_money' => 0
-
-            ];
-            
-            $res1=UserLogic::add($user);
-            if($res1==false){
-                Db::rollback();
-                throw new BusinessException(UserLogic::getError(), 0);
-            }
             if($params['status']==1){
+	            $user=[
+		            'real_name'=>$params['service_phone'],
+		            'nickname' => '用户'.$params['service_phone'],
+		            'account' => $params['service_phone'],
+		            'mobile' => $params['service_phone'],
+		            'password' => $params['service_phone'],
+		            'sex' => 0,
+		            'is_disable' => 0,
+		            'user_money' => 0
+	
+	            ];
+	            $res1=UserLogic::add($user);
+	            if($res1==false){
+		            Db::rollback();
+		            throw new BusinessException(UserLogic::getError(), 0);
+	            }
                 $data=[
                     'user_id'=>$res1['id'],
                     'status'=>1,
@@ -126,6 +127,9 @@ class SupplierLogic extends BaseLogic
             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');
+			}
             Db::commit();
             return true;
         } catch (\Exception $e) {
@@ -177,11 +181,11 @@ class SupplierLogic extends BaseLogic
 	            'financial_alipay' => $params['financial_alipay'] ?? '',
 	            'financial_type' => $params['financial_type'] ?? '',
                 'data_json'=>json_encode([
-                    'company_address' => $params['address'] ?? '',
-                    'company_nickname' => $params['nickname'] ?? '',
-                    'social_credit_code' => $params['social_credit_code'] ?? '',
-                    'company_name' => $params['company_name'] ?? '',
-                    'images'=>$params['images'][0] ?? '',
+	                'company_address' => $params['address'] ?? '',
+	                'company_nickname' => $params['company_nickname'] ?? '',
+	                'social_credit_code' => $params['social_credit_code'] ?? '',
+	                'company_name' => $params['company_name'] ?? '',
+	                'images'=>$params['images'][0] ?? '',
                     ])
             ]);
 
diff --git a/app/admin/service/JgPushService.php b/app/admin/service/JgPushService.php
new file mode 100644
index 0000000..a8ebad2
--- /dev/null
+++ b/app/admin/service/JgPushService.php
@@ -0,0 +1,54 @@
+<?php
+	
+	namespace app\admin\service;
+	
+	use JPush\Client;
+	use support\Log;
+	
+	
+	class JgPushService
+	{
+		public  $client;
+		public  $push;
+		public  $iosKey;
+		public  $iosSecret;
+		public  $azKey;
+		public  $azSecret;
+		
+		public function __construct()
+		{
+			// ios
+			$this->iosKey = '8a5efd65cda14fafa6e64ad3';
+			$this->iosSecret = 'daebe19b547c43128796a078';
+			// 安卓
+			$this->azKey = 'b5f679f4357018605ea6fd2e';
+			$this->azSecret = 'c4fb573758f8d7058d697c54';
+		}
+		
+		public function sendMsg($register_id,$message,$route = '',$type = 1){
+			try {
+				$this->client = new Client($this->iosKey, $this->iosSecret);
+				$this->push = $this->client->push();
+				$this->push->setPlatform(['android', 'ios']);
+				$this->push->addRegistrationId($register_id);
+				$this->push->iosNotification($message, ['extras' => ['route' => $route, 'type' => $type]]);
+				$this->push->send();
+				unset($this->client, $this->push);
+			} catch (\Exception $e) {
+				dump($e->getMessage());
+				Log::error($e->getMessage());
+			}
+			try {
+				$this->client = new Client($this->azKey, $this->azSecret);
+				$this->push = $this->client->push();
+				$this->push->setPlatform(['android', 'ios']);
+				$this->push->addRegistrationId($register_id);
+				$this->push->androidNotification($message, ['extras' => ['route' => $route, 'type' => $type]]);
+				$this->push->send();
+				unset($this->client, $this->push);
+			} catch (\Exception $e) {
+				dump($e->getMessage());
+				Log::error($e->getMessage());
+			}
+		}
+	}
\ No newline at end of file