更新

server/app/adminapi/logic/qywx/CustomerLogic.php

@@ -9,6 +9,7 @@ use app\common\model\auth\Admin;
 use app\common\model\QywxExternalContact;
 use app\common\model\QywxSyncSettings;
 use app\common\service\qywx\MediaChannelService;
+use app\common\service\qywx\QywxExternalContactEventTagSnapshotService;
 use app\common\service\wechat\WechatWorkService;
 use think\facade\Cache;
 use think\facade\Db;
@@ -589,7 +590,11 @@ class CustomerLogic extends BaseLogic
      *
      * @see https://developer.work.weixin.qq.com/document/path/92130
      */
-    public static function upsertSingleExternalContactFromApi(string $externalUserId): void
+    public static function upsertSingleExternalContactFromApi(
+        string $externalUserId,
+        int $snapshotEventId = 0,
+        string $snapshotFollowUserId = ''
+    ): void
     {
         $externalUserId = trim($externalUserId);
         if ($externalUserId === '') {
@@ -652,6 +657,13 @@ class CustomerLogic extends BaseLogic
             $updateCount,
             $skippedCount
         );
+        if ($snapshotEventId > 0 && $snapshotFollowUserId !== '') {
+            QywxExternalContactEventTagSnapshotService::captureFromFollowUsers(
+                $snapshotEventId,
+                $snapshotFollowUserId,
+                $followUsers
+            );
+        }
         MediaChannelService::forgetCurrentTagCatalogCache();
     }
 
@@ -674,12 +686,12 @@ class CustomerLogic extends BaseLogic
      *
      * @param array<string, mixed> $data
      */
-    public static function recordExternalContactEvent(array $data): void
+    public static function recordExternalContactEvent(array $data): int
     {
         $changeType = (string) ($data['change_type'] ?? '');
         if ($changeType === '') {
             // 没有 ChangeType 的事件流水没有价值，直接丢弃
-            return;
+            return 0;
         }
 
         $eventTime = (int) ($data['event_time'] ?? 0);
@@ -716,9 +728,18 @@ class CustomerLogic extends BaseLogic
             $sql = 'INSERT IGNORE INTO `' . $table . '` (`' . implode('`,`', $cols) . '`) VALUES ('
                 . implode(',', array_fill(0, count($cols), '?')) . ')';
             Db::execute($sql, array_values($row));
+
+            return (int) Db::name('qywx_external_contact_event')
+                ->where('change_type', $row['change_type'])
+                ->where('user_id', $row['user_id'])
+                ->where('external_userid', $row['external_userid'])
+                ->where('event_time', $row['event_time'])
+                ->value('id');
         } catch (\Throwable $e) {
             // 事件流水只用于统计，失败只记日志不阻塞主回调
             Log::warning('qywx external contact event insert failed: ' . $e->getMessage());
+
+            return 0;
         }
     }