From adfce2bc5c55f04e927d10236688edc273500277 Mon Sep 17 00:00:00 2001
From: DongZeLiang <2746733890@qq.com>
Date: Tue, 26 Mar 2024 11:24:13 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/resp/ProjectDetailResp.java        |  5 ++++
 .../service/impl/ProjectInfoServiceImpl.java  | 26 ++++++++-----------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/ProjectDetailResp.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/ProjectDetailResp.java
index 88d6487..045ba09 100644
--- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/ProjectDetailResp.java
+++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/ProjectDetailResp.java
@@ -32,6 +32,11 @@ public class ProjectDetailResp {
      */
     private ProjectInfo projectInfo;
 
+    /**
+     * 品牌信息
+     */
+    private BrandInfo brandInfo;
+
     /**
      * 商品Sku集合
      */
diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProjectInfoServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProjectInfoServiceImpl.java
index 9250ec1..1963db0 100644
--- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProjectInfoServiceImpl.java
+++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProjectInfoServiceImpl.java
@@ -7,10 +7,7 @@ import java.util.List;
 import com.muyu.common.core.utils.ObjUtils;
 import com.muyu.common.security.utils.SecurityUtils;
 import com.muyu.product.domain.*;
-import com.muyu.product.domain.model.AttrValueModel;
-import com.muyu.product.domain.model.ProductSkuModel;
-import com.muyu.product.domain.model.ProjectAddModel;
-import com.muyu.product.domain.model.RuleAttrAddModel;
+import com.muyu.product.domain.model.*;
 import com.muyu.product.domain.req.ProjectInfoSaveReq;
 import com.muyu.product.domain.resp.CategoryCommonElementResp;
 import com.muyu.product.domain.resp.ProjectDetailResp;
@@ -46,16 +43,7 @@ public class ProjectInfoServiceImpl extends ServiceImpl<ProjectInfoMapper, Proje
     private RuleAttrInfoService ruleAttrInfoService;
 
     @Autowired
-    private AsCategoryAttributeService asCategoryAttributeService;
-
-    @Autowired
-    private AsCategoryAttributeGroupService asCategoryAttributeGroupService;
-
-    @Autowired
-    private AttributeGroupService attributeGroupService;
-
-    @Autowired
-    private AttributeInfoService attributeInfoService;
+    private BrandInfoService brandInfoService;
 
     /**
      * 查询商品信息列表
@@ -158,6 +146,8 @@ public class ProjectInfoServiceImpl extends ServiceImpl<ProjectInfoMapper, Proje
     public ProjectDetailResp getDetailInfo (Long id) {
         // 商品信息获取
         ProjectInfo projectInfo = this.getById(id);
+        // 品牌信息
+        BrandInfo brandInfo = this.brandInfoService.getById(projectInfo.getBrandId());
         // 品类集合
         List<CategoryInfo> categoryInfoList = categoryInfoService.listByIds(new ArrayList<>() {{
             add(projectInfo.getMianType());
@@ -181,13 +171,19 @@ public class ProjectInfoServiceImpl extends ServiceImpl<ProjectInfoMapper, Proje
 
 
         CategoryCommonElementResp templateAttribute = this.categoryInfoService.getTemplateAttributeByCateGoryId(projectInfo.getType());
+        List<TemplateAttributeModel> templateAttributeList = templateAttribute.getTemplateAttributeList();
+        // TODO 添加上，商品的自有属性
+        List<TemplateAttributeModel> projectAttributeList = null;
+        // 把自有属性添加到商品属性的集合当中，进行合并
+        templateAttributeList.addAll(projectAttributeList);
         return ProjectDetailResp.builder()
                 .projectInfo(projectInfo)
+                .brandInfo(brandInfo)
                 .categoryInfoList(categoryInfoList)
                 .projectSkuInfoList(projectSkuInfoList)
                 .productAttributeInfoList(productAttributeInfoList)
                 .ruleAttrModelList(ruleAttrModelList)
-                .attributeInfoList(templateAttribute.getTemplateAttributeList())
+                .attributeInfoList(templateAttributeList)
                 .attributeGroupList(templateAttribute.getTemplateAttributeGroupList())
                 .build();
     }