商品信息修改回显

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/ProjectInfo.java

@@ -117,7 +117,7 @@ public class ProjectInfo extends BaseEntity {
                 .name(projectAddModel.getName())
                 .introduction(projectAddModel.getIntroduction())
                 .mianType(projectAddModel.getMianType())
-                .parentType(projectAddModel.getParenType())
+                .parentType(projectAddModel.getParentType())
                 .type(projectAddModel.getType())
                 .image(projectAddModel.getImage())
                 .carouselImages(projectAddModel.getCarouselImages())

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/aa

@@ -11,3 +11,23 @@
    "规格详情表"
   }
 }
+
+商品信息 商品品类 品类信息
+
+{
+   "商品品类":[
+     "品类id":
+     "品类名称"
+   ]
+   "商品轮播图":
+   "商品名称":
+   "商品价格":
+   "商品规格":[
+      {
+       "规格id"
+       "规格值"
+       }
+     ]
+    "商品数量"
+    "商品"
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/ProjectAddModel.java

@@ -1,7 +1,9 @@
 package com.muyu.product.domain.model;
 
 import com.muyu.common.core.web.domain.BaseEntity;
+import com.muyu.product.domain.AsProductAttributeInfo;
 import com.muyu.product.domain.ProjectInfo;
+import com.muyu.product.domain.ProjectSkuInfo;
 import com.muyu.product.domain.req.ProjectInfoQueryReq;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -10,6 +12,8 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
+import java.util.List;
+
 /**
  * 商品添加模型 ProjectAddModel
  *
@@ -44,7 +48,7 @@ public class ProjectAddModel extends BaseEntity {
      * 父类型
      */
     @ApiModelProperty(name = "父类型",value = "父类型")
-    private String parenType;
+    private String parentType;
 
     /**
      * 商品类型
@@ -83,21 +87,24 @@ public class ProjectAddModel extends BaseEntity {
     private Long brandId;
 
 
-    private ProductSkuModel productSkuModel;
+    private List<AsProductAttributeInfo> asProductAttributeInfos;
 
+     private List<ProjectSkuInfo> projectSkuInfos;
 
-    public static ProjectAddModel queryBuild(ProjectInfo projectInfoQueryReq){
+    public static ProjectAddModel queryBuild(ProjectInfo projectInfoQueryReq, List<AsProductAttributeInfo> asProductAttributeInfoList, List<ProjectSkuInfo> projectSkuInfoList){
         return ProjectAddModel.builder()
                 .name(projectInfoQueryReq.getName())
                 .introduction(projectInfoQueryReq.getIntroduction())
                 .mianType(projectInfoQueryReq.getMianType())
-                .parenType(projectInfoQueryReq.getParentType())
+                .parentType(projectInfoQueryReq.getParentType())
                 .type(projectInfoQueryReq.getType())
                 .image(projectInfoQueryReq.getImage())
                 .carouselImages(projectInfoQueryReq.getCarouselImages())
                 .status(projectInfoQueryReq.getStatus())
                 .ruleId(projectInfoQueryReq.getRuleId())
                 .brandId(projectInfoQueryReq.getBrandId())
+                .projectSkuInfos(projectSkuInfoList)
+                .asProductAttributeInfos(asProductAttributeInfoList)
                 .build();
     }
 

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

@@ -3,8 +3,14 @@ package com.muyu.product.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.muyu.product.domain.AsProductAttributeInfo;
+import com.muyu.product.domain.ProjectSkuInfo;
+import com.muyu.product.domain.model.CategoryInfoSaveModel;
 import com.muyu.product.domain.model.ProductSkuModel;
 import com.muyu.product.domain.model.ProjectAddModel;
+import com.muyu.product.service.AsProductAttributeInfoService;
+import com.muyu.product.service.ProjectSkuInfoService;
 import io.swagger.annotations.*;
 import org.apache.commons.lang3.SystemUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,6 +47,10 @@ import com.muyu.common.core.web.page.TableDataInfo;
 public class ProjectInfoController extends BaseController {
     @Autowired
     private ProjectInfoService projectInfoService;
+    @Autowired
+    private AsProductAttributeInfoService asProductAttributeInfoService;
+    @Autowired
+    private ProjectSkuInfoService projectSkuInfoService;
 
     /**
      * 查询商品信息列表
@@ -75,8 +85,21 @@ public class ProjectInfoController extends BaseController {
     @GetMapping(value = "/{id}")
     @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class)
     public Result<ProjectAddModel> getInfo(@PathVariable("id") Long id) {
-        ProductSkuModel ProductSkuModel= projectInfoService.find(id);
-        return Result.success(projectInfoService.getById1(id,ProductSkuModel));
+
+        LambdaQueryWrapper<AsProductAttributeInfo> asProductAttributeInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        asProductAttributeInfoLambdaQueryWrapper.eq(AsProductAttributeInfo::getProductId, id);
+        List<AsProductAttributeInfo> list = asProductAttributeInfoService.list(asProductAttributeInfoLambdaQueryWrapper);
+
+        ProjectInfo projectInfo = projectInfoService.getById(id);
+
+        LambdaQueryWrapper<ProjectSkuInfo> projectSkuInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        projectSkuInfoLambdaQueryWrapper.eq(ProjectSkuInfo::getProjectId,id);
+        List<ProjectSkuInfo> projectSkuInfos = projectSkuInfoService.list(projectSkuInfoLambdaQueryWrapper);
+
+        ProjectAddModel projectAddModel = ProjectAddModel.queryBuild(projectInfo,
+                list, projectSkuInfos
+        );
+        return Result.success(projectAddModel);
     }
 
     /**

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CategoryInfoMapper.java

@@ -3,6 +3,8 @@ package com.muyu.product.mapper;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.product.domain.CategoryInfo;
+import com.muyu.product.domain.model.CategoryInfoSaveModel;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 品类信息Mapper接口
@@ -10,6 +12,10 @@ import com.muyu.product.domain.CategoryInfo;
  * @author DongZeLiang
  * @date 2024-02-27
  */
+@Mapper
 public interface CategoryInfoMapper extends BaseMapper<CategoryInfo> {
 
+    CategoryInfoSaveModel findType(Long id);
+
+    CategoryInfoSaveModel getCategoryInfoByProjectId(Long id);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProjectInfoMapper.java

@@ -12,4 +12,5 @@ import com.muyu.product.domain.ProjectInfo;
  */
 public interface ProjectInfoMapper extends BaseMapper<ProjectInfo> {
 
+    ProjectInfo findType(Long id);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProjectSkuInfoMapper.java

@@ -2,6 +2,7 @@ package com.muyu.product.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muyu.product.domain.ProjectInfo;
 import com.muyu.product.domain.ProjectSkuInfo;
 import com.muyu.product.domain.model.ProductSkuModel;
 import org.apache.ibatis.annotations.Mapper;
@@ -16,4 +17,6 @@ import org.apache.ibatis.annotations.Mapper;
 public interface ProjectSkuInfoMapper extends BaseMapper<ProjectSkuInfo> {
 
     ProductSkuModel find(Long id);
+
+    ProjectInfo findType(Long id);
 }

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

@@ -72,4 +72,7 @@ public interface CategoryInfoService extends IService<CategoryInfo> {
     Boolean removeBatchById(List<Long> ids);
 
     void util(Long id, CategoryInfoEditReq categoryInfoEditReq);
+
+
+    CategoryInfoSaveModel getCategoryInfoByProjectId(Long id);
 }

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

@@ -28,7 +28,5 @@ public interface ProjectInfoService extends IService<ProjectInfo> {
 
     boolean util(Long id, ProjectInfoEditReq projectInfoEditReq);
 
-    ProductSkuModel find(Long id);
 
-    ProjectAddModel getById1(Long id, ProductSkuModel productSkuModel);
 }

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

@@ -424,4 +424,11 @@ public class CategoryInfoServiceImpl extends ServiceImpl<CategoryInfoMapper, Cat
 
         AsCategoryAttributeGroup asCategoryAttributeGroup = AsCategoryAttributeGroup.categoryBuild(id);
     }
+
+    @Autowired
+    private CategoryInfoMapper categoryInfoMapper;
+    @Override
+    public CategoryInfoSaveModel getCategoryInfoByProjectId(Long id) {
+        return categoryInfoMapper.getCategoryInfoByProjectId(id);
+    }
 }

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

@@ -1,19 +1,20 @@
 package com.muyu.product.service.impl;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import com.muyu.common.core.utils.ObjUtils;
 import com.muyu.common.security.utils.SecurityUtils;
-import com.muyu.product.controller.ProjectInfoController;
 import com.muyu.product.domain.*;
 import com.muyu.product.domain.model.AttrValueModel;
+import com.muyu.product.domain.model.CategoryInfoSaveModel;
 import com.muyu.product.domain.model.ProductSkuModel;
 import com.muyu.product.domain.model.ProjectAddModel;
 import com.muyu.product.domain.req.ProjectInfoEditReq;
 import com.muyu.product.domain.req.ProjectInfoSaveReq;
+import com.muyu.product.mapper.CategoryInfoMapper;
 import com.muyu.product.mapper.ProjectSkuInfoMapper;
 import com.muyu.product.service.AsProductAttributeInfoService;
+import com.muyu.product.service.CategoryInfoService;
 import com.muyu.product.service.ProjectSkuInfoService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -124,28 +125,10 @@ public class ProjectInfoServiceImpl extends ServiceImpl<ProjectInfoMapper, Proje
         }
         return save;
     }
-    @Override
-    public boolean util(Long id, ProjectInfoEditReq projectInfoEditReq) {
-
-        return false;
-    }
-@Autowired
-private ProjectSkuInfoMapper projectSkuInfoMapper;
-    @Override
-    public ProductSkuModel find(Long id) {
 
 
-        return   projectSkuInfoMapper.find(id);
-    }
 
-    @Override
-    public ProjectAddModel getById1(Long id, ProductSkuModel productSkuModel) {
 
-        ProjectInfo byId = this.getById(id);
-        ProjectAddModel projectAddModel = ProjectAddModel.queryBuild(byId);
-        projectAddModel.setProductSkuModel(productSkuModel);
-        return projectAddModel;
-    }
 
 
 }

muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/CategoryInfoMapper.xml

@@ -21,4 +21,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectCategoryInfoVo">
         select id, name, image, parent_id, start, introduction, remark, create_by, create_time, update_by, update_time from category_info
     </sql>
+    <select id="findType" resultType="com.muyu.product.domain.model.CategoryInfoSaveModel">
+        select * from category_info where  id =#{id}
+    </select>
+    <select id="getCategoryInfoByProjectId" resultType="com.muyu.product.domain.model.CategoryInfoSaveModel">
+        select * from category_info where id =#{id}
+    </select>
 </mapper>

muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/ProjectInfoMapper.xml

@@ -26,4 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectProjectInfoVo">
         select id, name, introduction, mian_type, parent_type, type, image, carousel_images, status, rule_id, brand_id, remark, create_by, create_time, update_by, update_time from project_info
     </sql>
+    <select id="findType" resultType="com.muyu.product.domain.ProjectInfo">
+        select  * from project_info where id =#{id}
+    </select>
 </mapper>

muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/ProjectSkuInfoMapper.xml

@@ -24,4 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="find" resultType="com.muyu.product.domain.model.ProductSkuModel">
         select * from  project_sku_info where id =#{id}
     </select>
+    <select id="findType" resultType="com.muyu.product.domain.ProjectInfo">
+        select * from  project_info where type=#{id}
+    </select>
 </mapper>