更新外观模块

app/amazon/similar_asin.py

@@ -276,8 +276,8 @@ class SimilarAsinTask(TaskBase):
 
         return list(grouped.values())
 
-    @staticmethod
-    def normalize_groups(data):
+    @staticmethod
+    def normalize_groups(data):
         groups = data.get("groups")
         if isinstance(groups, list) and len(groups) > 0:
             return groups
@@ -299,18 +299,71 @@ class SimilarAsinTask(TaskBase):
                 "displayId": first.get("displayId") or item_id,
                 "items": items,
             })
-        return normalized
+        return normalized
+
+    def fetch_parsed_payload(self, task_id, user_id=1):
+        url = f"{DELETE_BRAND_API_BASE}/api/similar-asin/tasks/{task_id}/parsed-payload"
+        response = requests.get(url, params={"user_id": user_id}, timeout=300, verify=False)
+        response.raise_for_status()
+        payload = response.json() if response.text else {}
+        if isinstance(payload, dict) and payload.get("success"):
+            return payload.get("data") or {}
+        raise RuntimeError(f"获取货源查询解析载荷失败: {payload}")
 
-    def process_task(self, task_data: dict):
+    @staticmethod
+    def _count_payload_rows(data):
+        rows = data.get("rows") or data.get("items") or []
+        if isinstance(rows, list) and rows:
+            return len(rows)
+
+        groups = data.get("groups") or []
+        if not isinstance(groups, list):
+            return 0
+
+        total = 0
+        for group in groups:
+            if isinstance(group, dict) and isinstance(group.get("items"), list):
+                total += len(group.get("items"))
+        return total
+
+    def _merge_parsed_payload(self, data, parsed_payload):
+        payload_rows = parsed_payload.get("allItems") or parsed_payload.get("items") or []
+        merged = {
+            **data,
+            "groups": parsed_payload.get("groups") or [],
+            "rows": payload_rows,
+        }
+        if parsed_payload.get("aiPrompt"):
+            merged["prompt"] = parsed_payload.get("aiPrompt")
+        if parsed_payload.get("apiKey") and not merged.get("api_key"):
+            merged["api_key"] = parsed_payload.get("apiKey")
+        return merged
+
+    def process_task(self, task_data: dict):
         """处理审批任务主入口
 
         Args:
             task_data: 任务数据
         """
         try:
-            data = task_data.get("data", {})
-            task_id = data.get("taskId")
-            groups = self.normalize_groups(data)
+            data = task_data.get("data", {})
+            task_id = data.get("taskId")
+            if task_id:
+                queued_rows = self._count_payload_rows(data)
+                try:
+                    parsed_payload = self.fetch_parsed_payload(task_id, data.get("user_id") or data.get("userId") or 1)
+                    data = self._merge_parsed_payload(data, parsed_payload)
+                    self.log(
+                        f"similar asin task {task_id} loaded full parsed payload from Java, queuedRows={queued_rows}, fullRows={self._count_payload_rows(data)}"
+                    )
+                except Exception as e:
+                    if not queued_rows:
+                        raise
+                    self.log(
+                        f"similar asin task {task_id} failed to load full parsed payload, fallback to queued rows={queued_rows}: {e}",
+                        "WARNING"
+                    )
+            groups = self.normalize_groups(data)
 
             if not task_id:
                 self.log("任务ID为空，跳过", "WARNING")
@@ -447,7 +500,7 @@ class SimilarAsinTask(TaskBase):
         """回传处理结果到API
         """
 
-        url = f"{DELETE_BRAND_API_BASE}/api/appearance-patent/tasks/{task_id}/result"
+        url = f"{DELETE_BRAND_API_BASE}/api/similar-asin/tasks/{task_id}/result"
 
         payload ={
           "submissionId": f"{int(time.time())}",