编辑渠道优惠政策子项界面显示该产品品牌

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());

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;

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());

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) {