提取pid-更新

app/Console/Commands/ReferralLinkPidDraw.php

@@ -64,7 +64,7 @@ class ReferralLinkPidDraw extends Command
                     continue;
                 }
 
-                $res = MassMsgService::drawPid($data, $pid, 'ReferralLinkPidDraw');
+                $res = $this->drawPid($data, $pid, 'ReferralLinkPidDraw');
             } catch (\Throwable $e) {
                 Log::logError('提取推广链接PID异常', [
                     'type'  => $type,
@@ -92,12 +92,12 @@ class ReferralLinkPidDraw extends Command
         }
     }
 
-    public function drawPid($data, &$pid)
+    public function drawPid($attachments, &$pid, $logName)
     {
-        Log::logInfo('提取开始', $data, 'ReferralLinkPidDraw');
+        Log::logInfo('提取开始', $attachments, $logName);
 
-        $drawPids     = [];
-        foreach ($data as $datum) {
+        $drawPids = [];
+        foreach ($attachments as $datum) {
             if (isset($datum['msgtype'])) {
                 $url = null;
                 // 小程序
@@ -133,71 +133,97 @@ class ReferralLinkPidDraw extends Command
                     $url = $datum['promote']['jump_url'];
                 }
 
+                // 欢迎语中的H5推广会被转换成普通链接方式
+                if (
+                    ($datum['msgtype'] == 'link')
+                    &&
+                    isset($datum['link']['jump_url'])
+                    &&
+                    !empty($datum['link']['jump_url'])
+                ) {
+                    $url = $datum['link']['jump_url'];
+                }
+
                 // 属于其他类型
                 if (is_null($url)) continue;
 
-                Log::logInfo('处理url', ['url' => $url], 'ReferralLinkPidDraw');
+                Log::logInfo('提取URL', [
+                    'url'       => $url
+                ], $logName);
 
                 // 处理url
-                $fildExistNum = 0;
-                $this->dealUrl($url, $fildExistNum, $drawPids);
+                $filedExistNum = 0;
+                $this->dealUrl($url, $filedExistNum, $drawPids, $logName);
 
-                if ($fildExistNum > 1) {
-                    Log::logError('提取推广链接PID存在多个字段', $datum, 'ReferralLinkPidDraw');
+                if ($filedExistNum > 1) {
+                    Log::logError('提取推广链接PID存在多个字段', $datum, $logName);
                     return false;
                 }
             }
 
-            if (count($drawPids) > 1) {
-                Log::logError('提取推广链接PID存在多个值', $datum, 'ReferralLinkPidDraw');
-                return false;
-            }
+//            if (count($drawPids) > 1) {
+//                Log::logError('提取推广链接PID存在多个值', $datum, $logName);
+//                return false;
+//            }
 
-            if (!empty($drawPids)) $pid = current($drawPids);
+            if (!empty($drawPids)) $pid = json_encode(array_filter($drawPids));
 
-            Log::logInfo('提取结束', $data, 'ReferralLinkPidDraw');
+            Log::logInfo('提取结束', $attachments, $logName);
         }
 
         return true;
     }
 
-    public function dealUrl($url, &$fildExistNum, &$drawPids)
+    public function dealUrl($url, &$filedExistNum, &$drawPids, $logName)
     {
+        $url = str_replace("%25", "%", $url);
+        $url = str_replace("&", "&", $url);
+
+        $url = urldecode($url);
         $urlArr = parse_url($url);
+
         if (!isset($urlArr['query']) && empty($urlArr['query'])) return false;
 
-        Log::logInfo('提取url', ['url' => $url, 'fildExistNum' => $fildExistNum, 'drawPids' => $drawPids], 'ReferralLinkPidDraw');
+        Log::logInfo('提取url', [
+            'url'           => $url,
+            'filedExistNum' => $filedExistNum,
+            'drawPids'      => $drawPids
+        ], $logName);
 
         parse_str($urlArr['query'], $query);
 
         // 柚子 pathId
         if (isset($query['pathId']) && !empty($query['pathId'])) {
-            $fildExistNum ++;
+            $filedExistNum ++;
             $drawPids[] = $query['pathId'];
         }
 
         // 嘉书 article
         if (isset($query['article']) && !empty($query['article'])) {
-            $fildExistNum ++;
+            $filedExistNum ++;
             $drawPids[] = $query['article'];
         }
 
         // 迈步 pid
         if (isset($query['pid']) && !empty($query['pid'])) {
-            $fildExistNum ++;
+            $filedExistNum ++;
             $drawPids[] = $query['pid'];
         }
 
         // 点众阳光 referral_id
         if (isset($query['referral_id']) && !empty($query['referral_id'])) {
-            $fildExistNum ++;
+            $filedExistNum ++;
             $drawPids[] = $query['referral_id'];
         }
 
         foreach ($query as $urlVal) {
-            $this->dealUrl($urlVal, $fildExistNum, $drawPids);
+            $this->dealUrl($urlVal, $filedExistNum, $drawPids, $logName);
         }
 
-        Log::logInfo('提取url结果', ['url' => $url, 'fildExistNum' => $fildExistNum, 'drawPids' => $drawPids], 'ReferralLinkPidDraw');
+        Log::logInfo('提取url结果', [
+            'url'           => $url,
+            'filedExistNum' => $filedExistNum,
+            'drawPids'      => $drawPids
+        ], $logName);
     }
 }

app/Service/MassMsgService.php

@@ -122,12 +122,12 @@ class MassMsgService
                 }
             }
 
-//            if (count($drawPids) > 1) {
-//                Log::logError('提取推广链接PID存在多个值', $datum, $logName);
-//                return false;
-//            }
+            if (count($drawPids) > 1) {
+                Log::logError('提取推广链接PID存在多个值', $datum, $logName);
+                return false;
+            }
 
-            if (!empty($drawPids)) $pid = json_encode(array_filter($drawPids));
+            if (!empty($drawPids)) $pid = current($drawPids);
 
             Log::logInfo('提取结束', $attachments, $logName);
         }