fix: 催办按任务类型分流 + 领取事务加锁防超发

- 临期/超期/自动释放查询按 task_type 区分完成口径：内容任务看 publish_url，截图任务看 result_submitted_at，截图任务不再被永久误判为未发布
- portal 领取改为事务内 SELECT ... FOR UPDATE 锁定可用内容，消除并发领取超发窗口

app/api/partner/route.ts

@@ -563,18 +563,6 @@ async function handlePost(request: Request) {
           { status: 400 },
         );
       }
-      const available = await db
-        .prepare(
-          `SELECT id FROM contents
-           WHERE task_id = ? AND status = 'available'
-           ORDER BY COALESCE(source_row, 999999), created_at, id
-           LIMIT ${quantity}`,
-        )
-        .bind(task.id)
-        .all<{ id: string }>();
-      if (available.results.length === 0) {
-        return Response.json({ error: "当前任务已领完" }, { status: 409 });
-      }
       const partnerId = wecomIdentity
         ? (await resolveWecomClaimant(db, wecomIdentity.externalUserId)).partnerId
         : `partner-ext-${hashText(
@@ -585,86 +573,102 @@ async function handlePost(request: Request) {
         : (claimantIdentifier?.display ?? "");
       const claimId = uid("claim");
       const claimToken = crypto.randomUUID().replaceAll("-", "");
-      const statements: DatabaseStatement[] = [
+      const claimResult = await db.transaction(async (tx) => {
-        wecomIdentity
+        const available = await tx
-          ? db
-              .prepare(
-                `INSERT INTO partners
-                  (id, name, wecom_name, owner, claimed_total, completed_total,
-                   wecom_external_user_id)
-                 VALUES (?, ?, ?, '外部KOC', 0, 0, ?)
-                 ON CONFLICT(id) DO UPDATE SET
-                   name = excluded.name,
-                   wecom_name = excluded.wecom_name,
-                   wecom_external_user_id = excluded.wecom_external_user_id`,
-              )
-              .bind(
-                partnerId,
-                claimantName,
-                claimantName,
-                wecomIdentity.externalUserId,
-              )
-          : db
-              .prepare(
-                `INSERT INTO partners
-                  (id, name, wecom_name, owner, claimed_total, completed_total)
-                 VALUES (?, ?, ?, '外部KOC', 0, 0)
-                 ON CONFLICT(id) DO UPDATE SET
-                   name = excluded.name,
-                   wecom_name = excluded.wecom_name`,
-              )
-              .bind(partnerId, claimantName, claimantName),
-        db
           .prepare(
-            `INSERT INTO claims
+            `SELECT id FROM contents
-              (id, task_id, partner_id, claimant_name, claim_token, quantity)
+             WHERE task_id = ? AND status = 'available'
-             VALUES (?, ?, ?, ?, ?, ?)`,
+             ORDER BY COALESCE(source_row, 999999), created_at, id
+             LIMIT ${quantity}
+             FOR UPDATE`,
           )
-          .bind(
+          .bind(task.id)
-            claimId,
+          .all<{ id: string }>();
-            task.id,
+        if (available.results.length === 0) return null;
-            partnerId,
+        const statements: DatabaseStatement[] = [
-            claimantName,
+          wecomIdentity
-            claimToken,
+            ? db
-            available.results.length,
+                .prepare(
-          ),
+                  `INSERT INTO partners
-      ];
+                    (id, name, wecom_name, owner, claimed_total, completed_total,
-      for (const content of available.results) {
+                     wecom_external_user_id)
+                   VALUES (?, ?, ?, '外部KOC', 0, 0, ?)
+                   ON CONFLICT(id) DO UPDATE SET
+                     name = excluded.name,
+                     wecom_name = excluded.wecom_name,
+                     wecom_external_user_id = excluded.wecom_external_user_id`,
+                )
+                .bind(
+                  partnerId,
+                  claimantName,
+                  claimantName,
+                  wecomIdentity.externalUserId,
+                )
+            : db
+                .prepare(
+                  `INSERT INTO partners
+                    (id, name, wecom_name, owner, claimed_total, completed_total)
+                   VALUES (?, ?, ?, '外部KOC', 0, 0)
+                   ON CONFLICT(id) DO UPDATE SET
+                     name = excluded.name,
+                     wecom_name = excluded.wecom_name`,
+                )
+                .bind(partnerId, claimantName, claimantName),
+          db
+            .prepare(
+              `INSERT INTO claims
+                (id, task_id, partner_id, claimant_name, claim_token, quantity)
+               VALUES (?, ?, ?, ?, ?, ?)`,
+            )
+            .bind(
+              claimId,
+              task.id,
+              partnerId,
+              claimantName,
+              claimToken,
+              available.results.length,
+            ),
+        ];
+        for (const content of available.results) {
+          statements.push(
+            db
+              .prepare(
+                `INSERT INTO distributions
+                  (id, task_id, content_id, partner_id, claim_id, status)
+                 VALUES (?, ?, ?, ?, ?, 'claimed')`,
+              )
+              .bind(uid("dist"), task.id, content.id, partnerId, claimId),
+            db
+              .prepare(
+                `UPDATE contents SET status = 'allocated'
+                 WHERE id = ? AND status = 'available'`,
+              )
+              .bind(content.id),
+          );
+        }
         statements.push(
           db
             .prepare(
-              `INSERT INTO distributions
+              `UPDATE tasks SET claimed_quantity = claimed_quantity + ?
-                (id, task_id, content_id, partner_id, claim_id, status)
+               WHERE id = ?`,
-               VALUES (?, ?, ?, ?, ?, 'claimed')`,
             )
-            .bind(uid("dist"), task.id, content.id, partnerId, claimId),
+            .bind(available.results.length, task.id),
           db
             .prepare(
-              `UPDATE contents SET status = 'allocated'
+              `UPDATE partners SET claimed_total = claimed_total + ?
-               WHERE id = ? AND status = 'available'`,
+               WHERE id = ?`,
             )
-            .bind(content.id),
+            .bind(available.results.length, partnerId),
         );
-      }
+        for (const statement of statements) {
-      statements.push(
+          await tx.execute(statement.sql, statement.values());
-        db
+        }
-          .prepare(
+        return { claimToken, claimedCount: available.results.length };
-            `UPDATE tasks SET claimed_quantity = claimed_quantity + ?
-             WHERE id = ?`,
-          )
-          .bind(available.results.length, task.id),
-        db
-          .prepare(
-            `UPDATE partners SET claimed_total = claimed_total + ?
-             WHERE id = ?`,
-          )
-          .bind(available.results.length, partnerId),
-      );
-      await db.batch(statements);
-      return Response.json({
-        claimToken,
-        claimedCount: available.results.length,
       });
+      if (!claimResult) {
+        return Response.json({ error: "当前任务已领完" }, { status: 409 });
+      }
+      return Response.json(claimResult);
     }
 
     if (body.action === "create_delegation") {

lib/wecom-notifier-service.ts

@@ -63,7 +63,11 @@ export async function runDueSoonWecomNotifications(
        JOIN tasks t ON t.id = d.task_id
        JOIN partners p ON p.id = d.partner_id
        JOIN contents c ON c.id = d.content_id
-       WHERE (d.publish_url IS NULL OR d.publish_url = '')
+       WHERE (
+             (t.task_type = 'screenshot_collect' AND d.result_submitted_at IS NULL)
+             OR (t.task_type != 'screenshot_collect'
+                 AND (d.publish_url IS NULL OR d.publish_url = ''))
+           )
          AND t.due_at IS NOT NULL AND t.due_at != ''
          AND t.due_at <= ?
        ORDER BY t.due_at ASC, p.name ASC`,
@@ -199,7 +203,11 @@ async function queryOverdueUnpublished(
        FROM distributions d
        JOIN tasks t ON t.id = d.task_id
        JOIN partners p ON p.id = d.partner_id
-       WHERE (d.publish_url IS NULL OR d.publish_url = '')
+       WHERE (
+             (t.task_type = 'screenshot_collect' AND d.result_submitted_at IS NULL)
+             OR (t.task_type != 'screenshot_collect'
+                 AND (d.publish_url IS NULL OR d.publish_url = ''))
+           )
          AND t.due_at IS NOT NULL AND t.due_at != ''
          AND t.due_at < ?
        ORDER BY t.due_at ASC, t.name ASC`,

tests/wecom-escalation.test.mjs

@@ -26,6 +26,9 @@ const overdueRows = [
     task_id: "task-A",
     task_name: "超期任务A",
     due_at: "2026-08-20",
+    task_type: "content_publish",
+    publish_url: null,
+    result_submitted_at: null,
     project_id: "proj-1",
     partner_id: "p-1",
     partner_name: "合作方甲",
@@ -35,6 +38,9 @@ const overdueRows = [
     task_id: "task-A",
     task_name: "超期任务A",
     due_at: "2026-08-20",
+    task_type: "content_publish",
+    publish_url: null,
+    result_submitted_at: null,
     project_id: "proj-1",
     partner_id: "p-2",
     partner_name: "合作方乙",
@@ -44,6 +50,9 @@ const overdueRows = [
     task_id: "task-B",
     task_name: "无项目任务B",
     due_at: "2026-08-25",
+    task_type: "content_publish",
+    publish_url: null,
+    result_submitted_at: null,
     project_id: "",
     partner_id: "p-3",
     partner_name: "合作方丙",
@@ -64,6 +73,15 @@ const releasableDistribution = {
   result_submitted_at: null,
 };
 
+function filterOverdue(rows, cutoff) {
+  return rows.filter((row) => {
+    if (!(row.due_at && row.due_at < cutoff)) return false;
+    return row.task_type === "screenshot_collect"
+      ? !row.result_submitted_at
+      : !row.publish_url;
+  });
+}
+
 function fakeEscalationDb({ rows = overdueRows } = {}) {
   return {
     prepare(sql) {
@@ -77,8 +95,11 @@ function fakeEscalationDb({ rows = overdueRows } = {}) {
               return null;
             },
             async all() {
-              if (/FROM distributions d/.test(sql) && /publish_url IS NULL/.test(sql)) {
+              if (
-                return { results: rows.filter((row) => row.due_at < params[0]) };
+                /FROM distributions d/.test(sql) &&
+                /result_submitted_at IS NULL/.test(sql)
+              ) {
+                return { results: filterOverdue(rows, params[0]) };
               }
               return { results: [] };
             },
@@ -117,8 +138,11 @@ function fakeReleaseDb({ rows = overdueRows, blockedIds = [] } = {}) {
               return null;
             },
             async all() {
-              if (/FROM distributions d/.test(sql) && /publish_url IS NULL/.test(sql)) {
+              if (
-                return { results: rows.filter((row) => row.due_at < params[0]) };
+                /FROM distributions d/.test(sql) &&
+                /result_submitted_at IS NULL/.test(sql)
+              ) {
+                return { results: filterOverdue(rows, params[0]) };
               }
               return { results: [] };
             },
@@ -226,6 +250,75 @@ test("runOverdueEscalation no-ops without overdue rows", async () => {
   assert.equal(calls.length, 0);
 });
 
+test("runOverdueEscalation distinguishes screenshot tasks from content tasks", async () => {
+  const rows = [
+    {
+      id: "d-s1",
+      task_id: "task-S",
+      task_name: "截图任务S",
+      due_at: "2026-08-20",
+      task_type: "screenshot_collect",
+      publish_url: null,
+      result_submitted_at: null,
+      project_id: "",
+      partner_id: "p-1",
+      partner_name: "合作方甲",
+    },
+    {
+      id: "d-s2",
+      task_id: "task-S",
+      task_name: "截图任务S",
+      due_at: "2026-08-20",
+      task_type: "screenshot_collect",
+      publish_url: null,
+      result_submitted_at: "2026-08-21 09:00:00",
+      project_id: "",
+      partner_id: "p-2",
+      partner_name: "合作方乙",
+    },
+    {
+      id: "d-c1",
+      task_id: "task-A",
+      task_name: "内容任务A",
+      due_at: "2026-08-20",
+      task_type: "content_publish",
+      publish_url: "https://www.xiaohongshu.com/note/1",
+      result_submitted_at: null,
+      project_id: "",
+      partner_id: "p-3",
+      partner_name: "合作方丙",
+    },
+    {
+      id: "d-c2",
+      task_id: "task-A",
+      task_name: "内容任务A",
+      due_at: "2026-08-20",
+      task_type: "content_publish",
+      publish_url: null,
+      result_submitted_at: null,
+      project_id: "",
+      partner_id: "p-4",
+      partner_name: "合作方丁",
+    },
+  ];
+  const calls = [];
+  const summary = await runOverdueEscalation(
+    fakeEscalationDb({ rows }),
+    config,
+    wecomFetch(calls),
+    NOW,
+  );
+  // 已提交截图的 d-s2 与已回填链接的 d-c1 不算超期
+  assert.equal(summary.overdueTasks, 2);
+  assert.equal(summary.overdueDistributions, 2);
+  const robotBodies = calls
+    .filter((call) => call.url.host === "qyapi.example.com")
+    .map((call) => JSON.parse(String(call.init.body)));
+  assert.equal(robotBodies.length, 1);
+  assert.match(robotBodies[0].text.content, /截图任务S（截止 2026-08-20）：1 条/);
+  assert.match(robotBodies[0].text.content, /内容任务A（截止 2026-08-20）：1 条/);
+});
+
 test("runOverdueAutoRelease is disabled without env switch", async () => {
   const calls = [];
   const db = fakeReleaseDb();