From 543961ef873b86864f892e9f52558df9bab5a5ef Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Fri, 17 Nov 2023 10:38:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=B8=A0=E9=81=93=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E6=94=BF=E7=AD=96=E5=AD=90=E9=A1=B9=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=AF=A5=E4=BA=A7=E5=93=81=E5=93=81=E7=89=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/goods/controller/GoodsCategoryController.java   | 4 ++++
 .../com/qs/serve/modules/goods/entity/GoodsCategory.java    | 3 +++
 .../modules/tzc/controller/TzcPolicyItemController.java     | 5 ++++-
 .../com/qs/serve/modules/tzc/entity/TzcPolicyGoods.java     | 6 +++++-
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java b/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java
index 2915c46c..d5251963 100644
--- a/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java
+++ b/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java
@@ -132,6 +132,10 @@ public class GoodsCategoryController {
         List<GoodsCategory> list = goodsCategoryService.list(lqw);
         List<GoodsCategoryTreeVo> treeVoList = list.stream().map(cate->{
             GoodsCategoryTreeVo treeNode = CopierUtil.copy(cate,new GoodsCategoryTreeVo());
+            if(param.getRelateBrandFlag()!=null&&param.getRelateBrandFlag().equals(1)){
+                cate.initCategoryNameByPathsName();
+                treeNode.setName("("+cate.getBrandLabel()+")"+treeNode.getName());
+            }
             treeNode.setId(cate.getId()+"");
             treeNode.setParentId(cate.getParentId().toString());
             treeNode.setCostFlag(cate.getCostFlag());
diff --git a/src/main/java/com/qs/serve/modules/goods/entity/GoodsCategory.java b/src/main/java/com/qs/serve/modules/goods/entity/GoodsCategory.java
index 324bac2c..c9e0af3f 100644
--- a/src/main/java/com/qs/serve/modules/goods/entity/GoodsCategory.java
+++ b/src/main/java/com/qs/serve/modules/goods/entity/GoodsCategory.java
@@ -117,6 +117,9 @@ public class GoodsCategory implements Serializable {
     @TableField(exist = false)
     private String seriseLabel;
 
+    @TableField(exist = false)
+    private Integer relateBrandFlag;
+
     public void initCategoryNameByPathsName(){
         if(!StringUtils.hasText(this.levelPathNames)){
             return;
diff --git a/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyItemController.java b/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyItemController.java
index 06149212..93d9cd5d 100644
--- a/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyItemController.java
+++ b/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyItemController.java
@@ -93,7 +93,10 @@ public class TzcPolicyItemController {
     public R<TzcPolicyItem> getById(@PathVariable("id") String id){
         TzcPolicyItem tzcPolicyItem = tzcPolicyItemService.getById(id);
         List<TzcPolicyGoods> goodsList = tzcPolicyGoodsService.listByItemId(tzcPolicyItem.getId());
-        goodsList.forEach(TzcPolicyGoods::initSpuSkuName);
+        for (TzcPolicyGoods policyGoods : goodsList) {
+            policyGoods.initSpuSkuName();
+            policyGoods.setTargetName("("+policyGoods.getBrandName()+")"+policyGoods.getTargetName());
+        }
         tzcPolicyItem.setPolicyGoodsList(goodsList);
         if(CollectionUtil.isNotEmpty(tzcPolicyItem.getAttachIds())){
             List<String> attachIds = Arrays.asList(tzcPolicyItem.getAttachIds());
diff --git a/src/main/java/com/qs/serve/modules/tzc/entity/TzcPolicyGoods.java b/src/main/java/com/qs/serve/modules/tzc/entity/TzcPolicyGoods.java
index 38f6e282..4df50cc3 100644
--- a/src/main/java/com/qs/serve/modules/tzc/entity/TzcPolicyGoods.java
+++ b/src/main/java/com/qs/serve/modules/tzc/entity/TzcPolicyGoods.java
@@ -115,10 +115,14 @@ public class TzcPolicyGoods implements Serializable {
     @TableField(exist = false)
     private String skuName;
 
+    @TableField(exist = false)
+    private String brandName;
+
     public void initSpuSkuName(){
+        String[] names = this.getTargetLevelPathNames().split("_");
+        this.setBrandName(names[0]);
         if(this.getTargetType().equals(TbsGoodsType.sku.name())){
             try {
-                String[] names = this.getTargetLevelPathNames().split("_");
                 this.setSkuName(names[names.length-1]);
                 this.setSpuName(names[names.length-2]);
             } catch (Exception e) {