优化公众号订阅事件

app/Http/Home/Services/WeChatOfficialAccount.php

@@ -90,6 +90,18 @@ class WeChatOfficialAccount extends Service
 
     protected function handleSubscribeEvent($message)
     {
+        $openId = $message['FromUserName'] ?? '';
+        $eventKey = $message['EventKey'] ?? '';
+
+        /**
+         * 带场景值的关注事件
+         */
+        $userId = str_replace('qrscene_', '', $eventKey);
+
+        if ($userId && $openId) {
+            $this->saveWechatSubscribe($userId, $openId);
+        }
+
         return new TextMessage('开心呀，我们又多了一个小伙伴!');
     }
 
@@ -115,26 +127,8 @@ class WeChatOfficialAccount extends Service
 
         $userId = str_replace('qrscene_', '', $eventKey);
 
-        $userRepo = new UserRepo();
+        if ($userId && $openId) {
-
+            $this->saveWechatSubscribe($userId, $openId);
-        $user = $userRepo->findById($userId);
-
-        if (!$user) return $this->emptyReply();
-
-        $subscribeRepo = new WeChatSubscribeRepo();
-
-        $subscribe = $subscribeRepo->findByOpenId($openId);
-
-        if ($subscribe) {
-            if ($subscribe->user_id != $userId) {
-                $subscribe->user_id = $userId;
-            }
-            $subscribe->update();
-        } else {
-            $subscribe = new WeChatSubscribeModel();
-            $subscribe->user_id = $userId;
-            $subscribe->open_id = $openId;
-            $subscribe->create();
         }
 
         return $this->emptyReply();
@@ -200,4 +194,31 @@ class WeChatOfficialAccount extends Service
         return new TextMessage('没有匹配的服务哦！');
     }
 
+    protected function saveWechatSubscribe($userId, $openId)
+    {
+        if (!$userId || !$openId) return;
+
+        $userRepo = new UserRepo();
+
+        $user = $userRepo->findById($userId);
+
+        if (!$user) return;
+
+        $subscribeRepo = new WeChatSubscribeRepo();
+
+        $subscribe = $subscribeRepo->findByOpenId($openId);
+
+        if ($subscribe) {
+            if ($subscribe->user_id != $userId) {
+                $subscribe->user_id = $userId;
+                $subscribe->update();
+            }
+        } else {
+            $subscribe = new WeChatSubscribeModel();
+            $subscribe->user_id = $userId;
+            $subscribe->open_id = $openId;
+            $subscribe->create();
+        }
+    }
+
 }