diff --git a/app/common/service/JgPush.php b/app/common/service/JgPush.php
index 839d81f6..cc8c7bcc 100644
--- a/app/common/service/JgPush.php
+++ b/app/common/service/JgPush.php
@@ -39,10 +39,11 @@ class JgPush
                         if (empty($jgRegisterId)) {
                             continue;
                         }
+                        echo "jgRegisterId: $jgRegisterId \n";
                         $msg = $order['pay_type'] == StoreGroupOrder::PAY_TYPE_CREDIT_BUY ? '您有新的订单已结算，请注意查看。' : '您有新的订单，请注意查看。';
                         $msgType = $order['pay_type'] == StoreGroupOrder::PAY_TYPE_CREDIT_BUY ? 'ORDER_SETTLEMENT' : 'ORDER_CREATE';
                         $this->addRegistrationId($jgRegisterId);
-                        $this->androidNotification($msg, ['extras' => ['route' => $route, 'type' => $msgType]]);
+                        //$this->androidNotification($msg, ['extras' => ['route' => $route, 'type' => $msgType]]);
                         $this->iosNotification($msg, ['extras' => ['route' => $route, 'type' => $msgType]]);
                         $this->push->send();
                         unset($this->client, $this->push);
diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php
index bdba8903..34b60a38 100644
--- a/app/controller/api/Auth.php
+++ b/app/controller/api/Auth.php
@@ -1464,7 +1464,6 @@ class Auth extends BaseController
                 'status'   => ($status == 1 ? 1 : 2),
                 'fail_msg' => $remark
             ];
-            Db::name('merchant_intention')->where('mer_intention_id', $id)->where('type', 1)->update($updData);
             if ($status == 1) {
                 $repository->updateStatus($id, $data);
                 $intention = Db::name('merchant_intention')->where('mer_intention_id', $id)->where('type', 1)->find();
@@ -1482,6 +1481,7 @@ class Auth extends BaseController
                     'mer_certificate' => $merCertificate
                 ], $intention['mer_id']);
             }
+            Db::name('merchant_intention')->where('mer_intention_id', $id)->where('type', 1)->update($updData);
         } else {
             //商户交易申请
             $updData = [