2024/12/5

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoListModel.java

@@ -49,6 +49,10 @@ public class ActivityTeamInfoListModel {
      * 拼团商品图片
      */
     private String productImage;
+    /**
+     * 拼团商品id
+     */
+    private Long productId;
     /**
      * 商品价格
      */
@@ -72,20 +76,6 @@ public class ActivityTeamInfoListModel {
 
 
     public static ActivityTeamInfoListModel infoBuild(ActivityTeamInfo activityTeamInfo, Function<ActivityTeamInfoListModel.ActivityTeamInfoListModelBuilder, ActivityTeamInfoListModel> function) {
-        ActivityTeamInfoListModel activityTeamInfoListModel = ActivityTeamInfoListModel.builder()
-                .id(activityTeamInfo.getId())
-                .name(activityTeamInfo.getName())
-//                .openTeamNumber(teamOpenTypeNumber)
-//                .addTeamNumber(teamInTypeNumber)
-//                .attendNumber(teamOpenTypeNumber + teamInTypeNumber)
-                .endTime(activityTeamInfo.getEndTime())
-                .productImage(activityTeamInfo.getProductImage())
-//                .teamPrice(discountPrice.getTeamPrice())
-//                .productPrice(discountPrice.getProductPrice())
-//                .teamStock(teamProductStockModel.getTeamStock())
-//                .remainStock(teamProductStockModel.getRemainStock())
-                .status(activityTeamInfo.getStatus())
-                .build();
         return function.apply(
                 ActivityTeamInfoListModel.builder()
                         .id(activityTeamInfo.getId())

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoListResp.java

@@ -48,6 +48,10 @@ public class TeamInfoListResp {
      * 商品价格
      */
     private BigDecimal productPrice;
+    /**
+     * 商品id
+     */
+    private Long productId;
     /**
      * 剩余库存
      */
@@ -80,6 +84,7 @@ public class TeamInfoListResp {
                 .attendNumber(activityTeamInfoListModel.getAttendNumber())
                 .endTime(activityTeamInfoListModel.getEndTime())
                 .teamPrice(activityTeamInfoListModel.getTeamPrice())
+                .productId(activityTeamInfoListModel.getProductId())
                 .productImage(activityTeamInfoListModel.getProductImage())
                 .productPrice(activityTeamInfoListModel.getProductPrice())
                 .remainStock(activityTeamInfoListModel.getRemainStock())

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java

@@ -53,7 +53,7 @@ public class ActivityTeamController {
      * @param activityTeamInfoSaveReq 添加请求对象
      * @return 结果集
      */
-    @PostMapping
+    @PostMapping("/save")
     public Result<String> save(@RequestBody ActivityTeamInfoSaveReq activityTeamInfoSaveReq) {
         activityTeamInfoService.save(ActivityTeamInfoAddModel.addReqBuild(activityTeamInfoSaveReq));
         return Result.success();
@@ -64,7 +64,7 @@ public class ActivityTeamController {
      * @param id
      * @return
      */
-    @PostMapping("/findById/{id}")
+    @PostMapping("/findTeamById/{id}")
     public Result<TeamInfoFindByIdResp> findTeamById(@PathVariable Long id){
         return Result.success(TeamInfoFindByIdResp.teamInfoFindByIdBuild(activityTeamInfoService.findDetailById(id)));
     }

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java

@@ -53,6 +53,7 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
                                     .productPrice(discountPrice.getProductPrice())
                                     .teamStock(teamProductStockModel.getTeamStock())
                                     .remainStock(teamProductStockModel.getRemainStock())
+                                    .productId(activityTeamInfo.getProductId())
                                     .build();
                         })).toList();
         TableDataInfo<ActivityTeamInfoListModel> tableDataInfo = new TableDataInfo<>();
@@ -111,26 +112,4 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
         activityTeamProductSkuInfoService.BathSku(activityTeamProductInfoUpdModel.getUpdSkuList());
         return true;
     }
-
-//        activityTeamProductInfoUpdModel.getUpdSkuList().stream().forEach(activityTeamUpdSKuModel -> {
-//                    //存入id
-//                    activityTeamUpdSKuModel.getAddSkuList().stream().forEach(add->{
-//                        add.setTeamId(activityTeamProductInfoUpdModel.getTeamId());
-//                        add.setProductId(activityTeamProductInfoUpdModel.getProductId());
-//                    });
-//                    //非空校验 业务操作
-//                    List<ActivityTeamProductSkuAddModel> addSkuList = activityTeamUpdSKuModel.getAddSkuList();
-//                    Assert.notNull(addSkuList, "添加的SKU列表不能为空");
-//                    activityTeamProductSkuInfoService.add(addSkuList);
-//
-//                    List<ActivityTeamProductSkuReqModel> skuList = activityTeamUpdSKuModel.getSkuList();
-//                    Assert.notNull(skuList, "skuList 不能为空");
-//                    activityTeamProductSkuInfoService.updateBath(skuList);
-//
-//                    List<Long> delSkuIdList = activityTeamUpdSKuModel.getDelSkuIdList();
-//                    Assert.notNull(delSkuIdList, "delSkuIdList 不能为空");
-//                    activityTeamProductSkuInfoService.removeBatchByIds(delSkuIdList);
-//                });
-
-
 }

muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/datasource/impl/ProjectSkuDataRemoteImpl.java

@@ -1,5 +1,6 @@
 package com.muyu.product.cache.datasource.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.muyu.common.core.domain.Result;
 import com.muyu.product.cache.datasource.ProjectSkuData;
 import com.muyu.product.domain.ProjectSkuInfo;
@@ -10,6 +11,7 @@ import org.springframework.stereotype.Service;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**

muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/RemoteProjectInfoService.java

@@ -1,6 +1,7 @@
 package com.muyu.product.remote;
-import com.muyu.common.core.domain.Result;
+
 import com.muyu.common.core.constant.ServiceNameConstants;
+import com.muyu.common.core.domain.Result;
 import com.muyu.product.domain.ProjectInfo;
 import com.muyu.product.remote.factory.RemoteProjectInfoFactory;
 import org.springframework.cloud.openfeign.FeignClient;

muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/RemoteProjectSkuService.java

@@ -1,6 +1,7 @@
 package com.muyu.product.remote;
-import com.muyu.common.core.domain.Result;
+
 import com.muyu.common.core.constant.ServiceNameConstants;
+import com.muyu.common.core.domain.Result;
 import com.muyu.product.domain.ProjectSkuInfo;
 import com.muyu.product.remote.factory.RemoteProjectSkuFactory;
 import org.springframework.cloud.openfeign.FeignClient;

muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/RemoteRuleAttrService.java

@@ -1,8 +1,13 @@
 package com.muyu.product.remote;
-import com.muyu.common.core.domain.Result;
+
 import com.muyu.common.core.constant.ServiceNameConstants;
+import com.muyu.common.core.domain.Result;
+import com.muyu.product.domain.ProjectSkuInfo;
 import com.muyu.product.domain.RuleAttrInfo;
+import com.muyu.product.remote.factory.RemoteProjectSkuFactory;
 import com.muyu.product.remote.factory.RemoteRuleAttrFactory;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;

muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/RemoteRuleService.java

@@ -1,8 +1,13 @@
 package com.muyu.product.remote;
-import com.muyu.common.core.domain.Result;
+
 import com.muyu.common.core.constant.ServiceNameConstants;
+import com.muyu.common.core.domain.Result;
+import com.muyu.product.domain.ProjectSkuInfo;
 import com.muyu.product.domain.RuleInfo;
+import com.muyu.product.remote.factory.RemoteProjectSkuFactory;
 import com.muyu.product.remote.factory.RemoteRuleFactory;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;

muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/factory/RemoteProjectInfoFactory.java

@@ -2,7 +2,9 @@ package com.muyu.product.remote.factory;
 
 import com.muyu.common.core.domain.Result;
 import com.muyu.product.domain.ProjectInfo;
+import com.muyu.product.domain.RuleInfo;
 import com.muyu.product.remote.RemoteProjectInfoService;
+import com.muyu.product.remote.RemoteRuleService;
 import org.springframework.cloud.openfeign.FallbackFactory;
 
 /**

muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/factory/RemoteRuleAttrFactory.java

@@ -1,7 +1,11 @@
 package com.muyu.product.remote.factory;
+
 import com.muyu.common.core.domain.Result;
+import com.muyu.product.domain.ProjectSkuInfo;
 import com.muyu.product.domain.RuleAttrInfo;
+import com.muyu.product.remote.RemoteProjectSkuService;
 import com.muyu.product.remote.RemoteRuleAttrService;
+import com.muyu.product.remote.RemoteRuleService;
 import org.springframework.cloud.openfeign.FallbackFactory;
 
 import java.util.List;

muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/factory/RemoteRuleFactory.java

@@ -1,7 +1,9 @@
 package com.muyu.product.remote.factory;
 
 import com.muyu.common.core.domain.Result;
+import com.muyu.product.domain.ProjectSkuInfo;
 import com.muyu.product.domain.RuleInfo;
+import com.muyu.product.remote.RemoteProjectSkuService;
 import com.muyu.product.remote.RemoteRuleService;
 import org.springframework.cloud.openfeign.FallbackFactory;
 

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeGroupController.java

@@ -3,7 +3,6 @@ package com.muyu.product.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.muyu.common.core.domain.Result;
 import com.muyu.product.domain.model.AttributeGroupSaveModel;
 import com.muyu.product.domain.resp.AttributeGroupPageResp;
 import com.muyu.product.domain.resp.AttributeGroupUpdResp;
@@ -17,6 +16,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.log.annotation.Log;

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeInfoController.java

@@ -1,5 +1,5 @@
 package com.muyu.product.controller;
-import com.muyu.common.core.domain.Result;
+
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.log.annotation.Log;

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/BrandInfoController.java

@@ -1,5 +1,5 @@
 package com.muyu.product.controller;
-import com.muyu.common.core.domain.Result;
+
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.log.annotation.Log;
@@ -24,6 +25,7 @@ import com.muyu.product.domain.req.BrandInfoQueryReq;
 import com.muyu.product.domain.req.BrandInfoSaveReq;
 import com.muyu.product.domain.req.BrandInfoEditReq;
 import com.muyu.product.service.BrandInfoService;
+import com.muyu.common.core.web.page.TableDataInfo;
 
 /**
  * 品牌信息Controller

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryInfoController.java

@@ -1,9 +1,13 @@
 package com.muyu.product.controller;
-import com.muyu.common.core.domain.Result;
+
 import java.util.List;
+import java.util.function.Supplier;
 import javax.servlet.http.HttpServletResponse;
 
 import com.muyu.common.security.utils.SecurityUtils;
+import com.muyu.product.domain.AttributeGroup;
+import com.muyu.product.domain.AttributeInfo;
+import com.muyu.product.domain.BrandInfo;
 import com.muyu.product.domain.model.CategoryInfoSaveModel;
 import com.muyu.product.domain.resp.CategoryCommonElementResp;
 import com.muyu.product.domain.resp.CategoryParentCommonElementResp;
@@ -17,12 +21,14 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;
 import com.muyu.common.security.annotation.RequiresPermissions;
 import com.muyu.product.domain.CategoryInfo;
+import com.muyu.product.domain.req.CategoryInfoQueryReq;
 import com.muyu.product.domain.req.CategoryInfoSaveReq;
 import com.muyu.product.domain.req.CategoryInfoEditReq;
 import com.muyu.product.service.CategoryInfoService;

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CommentInfoController.java

@@ -1,5 +1,5 @@
 package com.muyu.product.controller;
-import com.muyu.common.core.domain.Result;
+
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.log.annotation.Log;
@@ -42,7 +43,7 @@ public class CommentInfoController extends BaseController {
      * 查询商品评论列表
      */
     @ApiOperation("获取商品评论列表")
-    @RequiresPermissions("product:comment:list")
+    //@RequiresPermissions("product:comment:list")
     @GetMapping("/list")
     public Result<TableDataInfo<CommentInfo>> list(CommentInfoQueryReq commentInfoQueryReq) {
         startPage();
@@ -107,4 +108,9 @@ public class CommentInfoController extends BaseController {
     public Result<String> remove(@PathVariable List<Long> ids) {
         return toAjax(commentInfoService.removeBatchByIds(ids));
     }
+
+    @GetMapping("listByProductId/{id}")
+    public List<CommentInfo> listByProductId(@PathVariable Long id) {
+        return commentInfoService.listByProductId(id);
+    }
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CommentLikeInfoController.java

@@ -1,5 +1,5 @@
 package com.muyu.product.controller;
-import com.muyu.common.core.domain.Result;
+
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.log.annotation.Log;

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectInfoController.java

@@ -1,5 +1,5 @@
 package com.muyu.product.controller;
-import com.muyu.common.core.domain.Result;
+
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.log.annotation.Log;
@@ -98,7 +99,8 @@ public class ProjectInfoController extends BaseController {
     @GetMapping(value = "/detail/{id}")
     @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class)
     public Result<ProjectDetailResp> getDetailInfo(@PathVariable("id") Long id) {
-        return Result.success(projectInfoService.getDetailInfo(id));
+        ProjectDetailResp detailInfo = projectInfoService.getDetailInfo(id);
+        return Result.success(detailInfo);
     }
 
     /**

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectSkuInfoController.java

@@ -1,5 +1,5 @@
 package com.muyu.product.controller;
-import com.muyu.common.core.domain.Result;
+
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.log.annotation.Log;

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleAttrInfoController.java

@@ -1,5 +1,5 @@
 package com.muyu.product.controller;
-import com.muyu.common.core.domain.Result;
+
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.log.annotation.Log;

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleInfoController.java

@@ -1,5 +1,5 @@
 package com.muyu.product.controller;
-import com.muyu.common.core.domain.Result;
+
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.log.annotation.Log;

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CommentInfoService.java

@@ -1,6 +1,8 @@
 package com.muyu.product.service;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.muyu.product.domain.CommentInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -19,4 +21,10 @@ public interface CommentInfoService extends IService<CommentInfo> {
      */
     public List<CommentInfo> list(CommentInfo commentInfo);
 
+    public default List<CommentInfo> listByProductId(Long id){
+        LambdaUpdateWrapper<CommentInfo> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(CommentInfo::getProjectId, id);
+        return list(wrapper);
+    }
+
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProjectInfoServiceImpl.java

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
 import com.muyu.product.mapper.ProjectInfoMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 商品信息Service业务层处理
@@ -145,6 +146,7 @@ public class ProjectInfoServiceImpl extends ServiceImpl<ProjectInfoMapper, Proje
      * @param id 商品ID
      * @return 商品详情
      */
+    @Transactional
     @Override
     public ProjectDetailResp getDetailInfo (Long id) {
         // 商品信息获取
@@ -173,7 +175,11 @@ public class ProjectInfoServiceImpl extends ServiceImpl<ProjectInfoMapper, Proje
                 .map(RuleAttrAddModel::infoBuild).toList();
 
 
-        CategoryCommonElementResp templateAttribute = this.categoryInfoService.getTemplateAttributeByCateGoryId(projectInfo.getType());
+        String a = String.valueOf(projectInfo.getType());
+        if (projectInfo.getType()==0){
+            a = String.valueOf(projectInfo.getParentType());
+        }
+        CategoryCommonElementResp templateAttribute = this.categoryInfoService.getTemplateAttributeByCateGoryId(Long.valueOf(a));
         List<TemplateAttributeGroupModel> templateAttributeGroupList = templateAttribute.getTemplateAttributeGroupList();
         List<TemplateAttributeModel> templateAttributeList = new ArrayList<>(){{
             addAll(templateAttribute.getTemplateAttributeList());
@@ -194,13 +200,14 @@ public class ProjectInfoServiceImpl extends ServiceImpl<ProjectInfoMapper, Proje
             notInAttributeIdList.addAll( attributeIdList );
         }
         // 添加上，商品的自有属性
+
+        if (notInAttributeIdList.size()!=0){
             List<AsProductAttributeInfo> productAttributeList = this.asProductAttributeInfoService.list(
                     new LambdaQueryWrapper<>() {{
                         eq(AsProductAttributeInfo::getProductId, projectInfo.getId());
                         notIn(AsProductAttributeInfo::getAttributeId, notInAttributeIdList);
                     }}
             );
-
             List<TemplateAttributeModel> projectAttributeList = new ArrayList<>();
             if (!productAttributeList.isEmpty()){
                 List<Long> attrIdList = productAttributeList.stream()
@@ -218,6 +225,9 @@ public class ProjectInfoServiceImpl extends ServiceImpl<ProjectInfoMapper, Proje
             if (!projectAttributeList.isEmpty()){
                 templateAttributeList.addAll(projectAttributeList);
             }
+        }
+
+
         return ProjectDetailResp.builder()
                 .projectInfo(projectInfo)
                 .brandInfo(brandInfo)

muyu-modules/muyu-product/muyu-product-server/src/main/resources/bootstrap.yml

@@ -15,16 +15,17 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 113.44.75.158:8848
+
         namespace: gxc-muyu
       config:
         # 配置中心地址
         server-addr: 113.44.75.158:8848
-        namespace: gxc-muyu
         # 配置文件格式
         file-extension: yml
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        namespace: gxc-muyu
 logging:
   level:
     com.muyu.product.mapper: DEBUG