添加新需求

backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/client/AppearancePatentCozeClient.java

@@ -675,6 +675,7 @@ public class AppearancePatentCozeClient {
         row.setAsin(source.getAsin());
         row.setCountry(source.getCountry());
         row.setSku(source.getSku());
+        row.setBrand(source.getBrand());
         row.setUrl(source.getUrl());
         row.setTitle(source.getTitle());
         row.setError(source.getError());

backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/model/dto/AppearancePatentResultRowDto.java

@@ -33,6 +33,10 @@ public class AppearancePatentResultRowDto {
     @JsonAlias({"SKU", "sellerSku", "seller_sku", "merchantSku", "merchant_sku", "商品SKU", "商品 sku", "库存SKU"})
     private String sku;
 
+    @Schema(description = "Python collected product brand. Preferred over the source Excel brand when exporting.", example = "Nike")
+    @JsonAlias({"Brand", "品牌"})
+    private String brand;
+
     @Schema(description = "商品主图或待检测图片 URL。Java 调用 Coze 时会放入 url_list。", example = "https://webstatic.aiproxy.vip/output/20260425/103322/demo.jpg")
     @JsonAlias({
             "imageUrl", "image_url", "imgUrl", "img_url", "pictureUrl", "picture_url",

backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskService.java

@@ -1268,6 +1268,7 @@ public class AppearancePatentTaskService {
         row.setAsin(sibling.getAsin());
         row.setCountry(sibling.getCountry());
         row.setSku(firstNonBlank(representative.getSku(), sibling.getSku()));
+        row.setBrand(representative.getBrand());
         row.setUrl(firstNonBlank(representative.getUrl(), sibling.getUrl()));
         row.setTitle(firstNonBlank(representative.getTitle(), sibling.getTitle()));
         row.setError(representative.getError());
@@ -3326,7 +3327,7 @@ public class AppearancePatentTaskService {
                 row.createCell(col++).setCellValue(firstNonBlank(parsedRow.getAsin(), ""));
                 row.createCell(col++).setCellValue(firstNonBlank(parsedRow.getCountry(), ""));
                 row.createCell(col++).setCellValue(readValueByHeader(parsedRow, "卖家名称", "卖家名", "卖家", "店铺名称", "店铺名", "seller name", "seller_name", "seller-name", "sellername", "store name", "shop name"));
-                row.createCell(col++).setCellValue(readValueByHeader(parsedRow, "品牌", "brand"));
+                row.createCell(col++).setCellValue(resolveBrand(resultRow, parsedRow));
                 row.createCell(col++).setCellValue(firstNonBlank(parsedRow.getPrice(), ""));
                 row.createCell(col++).setCellValue(resultRow == null ? firstNonBlank(parsedRow.getTitle(), "") : firstNonBlank(resultRow.getTitle(), parsedRow.getTitle()));
                 row.createCell(col++).setCellValue(resultRow == null ? firstNonBlank(parsedRow.getUrl(), "") : firstNonBlank(resultRow.getUrl(), parsedRow.getUrl()));
@@ -4172,6 +4173,23 @@ public class AppearancePatentTaskService {
         return "";
     }
 
+    static String resolveBrand(AppearancePatentResultRowDto resultRow, AppearancePatentParsedRowVo parsedRow) {
+        String pythonBrand = resultRow == null ? "" : resultRow.getBrand();
+        if (pythonBrand != null && !pythonBrand.isBlank()) {
+            return pythonBrand.trim();
+        }
+        if (parsedRow == null || parsedRow.getValues() == null) {
+            return "";
+        }
+        for (Map.Entry<String, String> entry : parsedRow.getValues().entrySet()) {
+            String header = entry.getKey() == null ? "" : entry.getKey().trim().toLowerCase(Locale.ROOT);
+            if (header.contains("品牌") || header.contains("brand")) {
+                return entry.getValue() == null ? "" : entry.getValue();
+            }
+        }
+        return "";
+    }
+
     private boolean hasInfringingPersistedConclusion(Long taskId) {
         if (taskId == null) {
             return false;