From 974b3b0af40c7cff97863b3854c9378ce2e5f1f6 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Wed, 16 Aug 2023 16:50:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8E=A8=E9=80=81=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/service/JgPush.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/common/service/JgPush.php b/app/common/service/JgPush.php
index e4628623..a7311e9d 100644
--- a/app/common/service/JgPush.php
+++ b/app/common/service/JgPush.php
@@ -81,17 +81,19 @@ class JgPush
                 $merUserId = Merchant::where('mer_id', $order['mer_id'])->value('uid');
                 $jgRegisterId = User::where('uid', $merUserId)->value('jg_register_id');
                 if (empty($jgRegisterId)) {
+                    Log::info("ORDER_CREATE 1");
                     break;
                 }
+                Log::info("ORDER_CREATE ============= 您有新的订单111，请注意查看。");
                 $this->addRegistrationId($jgRegisterId);
                 $this->androidNotification('您有新的订单，请注意查看111。', ['extras' => ['route' => $route, 'type' =>'ORDER_CREATE']]);
                 $this->iosNotification('您有新的订单，请注意查看111。', ['extras' => ['route' => $route, 'type' =>'ORDER_CREATE']]);
                 $this->push->send();
-                Log::info("ORDER_CREATE ============= 您有新的订单111，请注意查看。");
                 break;
             case 'ORDER_PAY_SUCCESS':
                 $order = app()->make(StoreOrderRepository::class)->get($data['id']);
                 if ($order->pay_type != StoreGroupOrder::PAY_TYPE_CREDIT_BUY) {
+                    Log::info("ORDER_CREATE 2");
                     break;
                 }
                 $route = "/pages/admin/orderDetail/index?id={$order['order_id']}&mer_id={$order['mer_id']}";
@@ -100,11 +102,11 @@ class JgPush
                 if (empty($jgRegisterId)) {
                     break;
                 }
+                Log::info("ORDER_PAY_SUCCESS ============= 您有新的订单222，请注意查看。");
                 $this->addRegistrationId($jgRegisterId);
                 $this->androidNotification('您有新的订单，请注意查看222。', ['extras' => ['route' => $route, 'type' =>'ORDER_PAY_SUCCESS']]);
                 $this->iosNotification('您有新的订单，请注意查看222。', ['extras' => ['route' => $route, 'type' =>'ORDER_PAY_SUCCESS']]);
                 $this->push->send();
-                Log::info("ORDER_PAY_SUCCESS ============= 您有新的订单222，请注意查看。");
                 break;
             default:
                 break;