修改商品信息

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

@@ -12,6 +12,8 @@ import io.swagger.annotations.*;
 import com.muyu.common.core.annotation.Excel;
 import com.muyu.common.core.web.domain.BaseEntity;
 
+import java.util.List;
+
 /**
  * 属性与组中间对象 as_attribute_group
  *

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

@@ -1,6 +1,8 @@
 package com.muyu.product.domain;
 
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -50,6 +52,7 @@ public class AttributeGroup extends BaseEntity {
     private String states;
 
 
+
     /**
     * 查询构造器
     */
@@ -86,6 +89,7 @@ public class AttributeGroup extends BaseEntity {
     public static AttributeGroup editBuilds(Long id, AttributeGroupEditReq attributeGroupEditReq){
         return AttributeGroup.builder()
                 .id(id)
+                .name(attributeGroupEditReq.getName())
                 .states(attributeGroupEditReq.getStates())
                 .build();
     }

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

@@ -91,6 +91,27 @@ public class ProjectInfo extends BaseEntity {
     @ApiModelProperty(name = "品牌", value = "品牌")
     private Long brandId;
 
+    @Excel(name = "备注")
+    @ApiModelProperty(name = "备注", value = "备注")
+    private String remark;
+
+    @Excel(name = "创建人")
+    @ApiModelProperty(name = "创建人", value = "创建人")
+    private String createBy;
+
+    @Excel(name = "创建时间")
+    @ApiModelProperty(name = "创建时间", value = "创建时间")
+    private Date createTime;
+
+    /** 品牌 */
+    @Excel(name = "更新人")
+    @ApiModelProperty(name = "更新人", value = "更新人")
+    private String updateBy;
+
+    @Excel(name = "更新时间")
+    @ApiModelProperty(name = "更新时间", value = "更新时间")
+    private Date updateTime;
+
     /**
     * 查询构造器
     */
@@ -145,6 +166,11 @@ public class ProjectInfo extends BaseEntity {
                 .status(projectInfoEditReq.getStatus())
                 .ruleId(projectInfoEditReq.getRuleId())
                 .brandId(projectInfoEditReq.getBrandId())
+                .remark(projectInfoEditReq.getRemark())
+                .updateBy(projectInfoEditReq.getUpdateBy())
+                .createTime(new Date())
+                .createBy(projectInfoEditReq.getCreateBy())
+                .updateTime(new Date())
                 .build();
     }
 

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

@@ -16,6 +16,7 @@ import lombok.experimental.SuperBuilder;
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 public class ProjectAddModel extends BaseEntity {
+    private Long id;
 
     /** 商品名称 */
     @ApiModelProperty(name = "商品名称", value = "商品名称")

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

@@ -4,6 +4,7 @@ import java.util.Date;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.muyu.product.domain.AttributeGroup;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -35,5 +36,7 @@ public class AttributeGroupEditReq extends BaseEntity {
     @ApiModelProperty(name = "状态", value = "状态", required = true)
     private String states;
     private List<AttributeInfoSaveReq> attributeList;
+    private List<AttributeInfoSaveReq> attributeGroupList;
+    private AttributeGroup attributeGroup;
 
 }

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

@@ -8,6 +8,8 @@ import lombok.experimental.SuperBuilder;
 import io.swagger.annotations.*;
 import com.muyu.common.core.web.domain.BaseEntity;
 
+import java.util.List;
+
 /**
  * 商品信息对象 project_info
  *
@@ -62,5 +64,6 @@ public class ProjectInfoEditReq extends BaseEntity {
     /** 品牌 */
     @ApiModelProperty(name = "品牌", value = "品牌")
     private Long brandId;
+    private List<Long> productSkuList;
 
 }

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

@@ -1,6 +1,8 @@
 package com.muyu.product.domain.req;
 
 import java.math.BigDecimal;
+import java.util.List;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -44,4 +46,6 @@ public class ProjectSkuInfoEditReq extends BaseEntity {
     @ApiModelProperty(name = "规格图片", value = "规格图片", required = true)
     private String image;
 
+     private List<Long> productSkuList;
+
 }

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

@@ -1,6 +1,7 @@
 package com.muyu.product.domain.resp;
 
 import com.muyu.common.core.web.domain.BaseEntity;
+import com.muyu.product.domain.AttributeGroup;
 import com.muyu.product.domain.model.TemplateAttributeGroupModel;
 import com.muyu.product.domain.model.TemplateAttributeModel;
 import lombok.*;
@@ -34,6 +35,7 @@ public class CategoryCommonElementResp extends BaseEntity {
      * 自有属性（所有未包含属性）
      */
     private List<TemplateAttributeModel> attributeList;
+    private Long cateGoryId;
 
 
 }

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

@@ -77,7 +77,8 @@ public class ProjectInfoController extends BaseController {
     @GetMapping(value = "/{id}")
     @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class)
     public Result<ProjectInfo> getInfo(@PathVariable("id") Long id) {
-        return Result.success(projectInfoCache.get(id));
+        ProjectInfo projectInfo = projectInfoCache.get(id);
+        return Result.success(projectInfo);
     }
 
     /**

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

@@ -22,6 +22,7 @@ import com.muyu.product.mapper.UpdAsCategoryAttributeMapper;
 import com.muyu.product.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;