From 196305dcfe7852655801867d003f0e79464d1b18 Mon Sep 17 00:00:00 2001
From: "15989082884@163.com" <15989082884@163.com>
Date: Wed, 12 Jul 2023 10:29:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7=20=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tbs/controller/TbsActivityController.java |  1 +
 .../modules/tbs/entity/TbsActivityGoods.java  | 30 +++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java
index fa01c335..034bcbff 100644
--- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java
+++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java
@@ -243,6 +243,7 @@ public class TbsActivityController {
         if(goodsList.size()>0){
             activity.setGoodsType(goodsList.get(0).getTargetType());
             goodsList.forEach(TbsActivityGoods::initSpuSkuName);
+            goodsList.forEach(TbsActivityGoods::initCategoryNameByPathsName);
         }
         activity.setGoodsList(goodsList);
         List<TbsActivityChannel> activityChannels = activityChannelService.list(qw);
diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityGoods.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityGoods.java
index 6a2ad851..500b864d 100644
--- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityGoods.java
+++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityGoods.java
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.qs.serve.common.util.StringUtils;
 import com.qs.serve.modules.tbs.common.TbsGoodsType;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
@@ -112,7 +113,36 @@ public class TbsActivityGoods implements Serializable {
     @TableField(exist = false)
     private String skuName;
 
+    @TableField(exist = false)
+    private String brandName;
+
+    @TableField(exist = false)
+    private String categoryName;
+
+    @TableField(exist = false)
+    private String seriseName;
+
+    public void initCategoryNameByPathsName(){
+        if(!StringUtils.hasText(this.getTargetLevelPathNames())){
+            return;
+        }
+        String[] names = this.getTargetLevelPathNames().split("_");
+        if(names.length==1){
+            this.brandName = names[0];
+        }else if(names.length==2){
+            this.brandName = names[0];
+            this.categoryName = names[1];
+        }else if(names.length >=3){
+            this.brandName = names[0];
+            this.categoryName = names[1];
+            this.seriseName = names[2];
+        }
+    }
+
     public void initSpuSkuName(){
+        if(!StringUtils.hasText(this.getTargetLevelPathNames())){
+            return;
+        }
         if(this.getTargetType().equals(TbsGoodsType.sku.name())){
             try {
                 String[] names = this.getTargetLevelPathNames().split("_");