修改领取顺序,先核销

apps/backend/src/services/fulfillment/kuaishou-cloud/task-finalization.ts

@@ -523,8 +523,12 @@ export async function returnKuaishouCloudFulfillmentTask(
   let nextTaskStatus: TaskStatus = TASK_STATUS.COMPLETED;
   let nextResultCode = "kuaishou_cloud_completed";
   let nextResultMessage = "cloudtentacles 发货、退号并完成快手核销";
+  const consumeAlreadyCompleted = flow.consume.status === "success";
 
-  if (!order) {
+  if (consumeAlreadyCompleted) {
+    consumeStatus = "success";
+    consumedAt = flow.consume.consumedAt || now;
+  } else if (!order) {
     consumeStatus = "failed";
     consumeErrorMessage = "任务关联订单不存在，无法执行快手核销";
   } else if (!ticketCode) {
@@ -626,9 +630,11 @@ export async function returnKuaishouCloudFulfillmentTask(
 
   await createTaskEvent(
     task.id,
-    consumeStatus === "success"
-      ? "kuaishou_cloud_consumed"
-      : "kuaishou_cloud_consume_failed",
+    consumeAlreadyCompleted
+      ? "kuaishou_cloud_consume_already_completed"
+      : consumeStatus === "success"
+        ? "kuaishou_cloud_consumed"
+        : "kuaishou_cloud_consume_failed",
     {
       source: String(options.source || "system").trim() || "system",
       ticketCodeMasked: maskCode(ticketCode),