diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsAttributeGroup.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsAttributeGroup.java index 386d56e..c95f62b 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsAttributeGroup.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsAttributeGroup.java @@ -15,7 +15,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 属性与组中间对象 as_attribute_group * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsBrandProject.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsBrandProject.java index 0d1e2ef..16aff41 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsBrandProject.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsBrandProject.java @@ -15,7 +15,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 品牌商品中间对象 as_brand_project * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsCategoryAttribute.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsCategoryAttribute.java index 1e5c11c..4a27e22 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsCategoryAttribute.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsCategoryAttribute.java @@ -16,7 +16,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 品类属性中间对象 as_category_attribute * - * @author DongZeLiang + * @author 杨乐 * @date 2024-02-27 */ @Data @@ -45,10 +45,10 @@ public class AsCategoryAttribute extends BaseEntity implements CategoryBase { @ApiModelProperty(name = "属性id", value = "属性id", required = true) private Long attributeId; - public static AsCategoryAttribute categoryBuild(Long groupId, Long categoryInfoId) { + public static AsCategoryAttribute categoryBuild(Long categoryInfoId, Long attributeId) { return AsCategoryAttribute.builder() .categoryId(categoryInfoId) - .attributeId(groupId) + .attributeId(attributeId) .build(); } @@ -57,6 +57,15 @@ public class AsCategoryAttribute extends BaseEntity implements CategoryBase { .categoryId(attributeId) // 修改此处为 categoryId .build(); } + + public static AsCategoryAttribute categoryBuildtwo(Long categoryInfoId, Long attributeId) { + return AsCategoryAttribute.builder() + .categoryId(categoryInfoId) + .attributeId(attributeId) + .build(); + } + + @Override public Long getBaseId() { return this.attributeId; diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsCategoryAttributeGroup.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsCategoryAttributeGroup.java index a1ece0b..81819bc 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsCategoryAttributeGroup.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsCategoryAttributeGroup.java @@ -16,7 +16,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 品类属性组中间对象 as_category_attribute_group * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data @@ -52,6 +52,12 @@ public class AsCategoryAttributeGroup extends BaseEntity implements CategoryBase .build(); } + public static AsCategoryAttributeGroup cateBuild(Long categoryId){ + return AsCategoryAttributeGroup.builder() + .attributeGroupId(categoryId) + .categoryId(categoryId) + .build(); + } @Override public Long getBaseId() { return this.attributeGroupId; diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsCategoryBrand.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsCategoryBrand.java index 21cad7e..4f4b684 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsCategoryBrand.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsCategoryBrand.java @@ -16,7 +16,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 品类品牌中间对象 as_category_brand * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data @@ -44,6 +44,7 @@ public class AsCategoryBrand extends BaseEntity implements CategoryBase { @Excel(name = "品牌id") @ApiModelProperty(name = "品牌id", value = "品牌id", required = true) private Long brandId; + public static AsCategoryBrand categoryBuild(Long categoryInfoId, Long brandId) { return AsCategoryBrand.builder() .brandId(brandId) @@ -51,6 +52,11 @@ public class AsCategoryBrand extends BaseEntity implements CategoryBase { .build(); } + public static AsCategoryBrand categoryBrand(Long brandId){ + return AsCategoryBrand.builder() + .brandId(brandId) + .build(); + } @Override public Long getBaseId() { return this.brandId; diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsProductAttributeInfo.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsProductAttributeInfo.java index 6336ec2..abd99c0 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsProductAttributeInfo.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsProductAttributeInfo.java @@ -18,7 +18,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 商品属性对象 as_product_attribute_info * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeGroup.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeGroup.java index 22a2638..58abb2c 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeGroup.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeGroup.java @@ -20,7 +20,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 属性组对象 attribute_group * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeInfo.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeInfo.java index 5842aa9..4cfa7aa 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeInfo.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeInfo.java @@ -21,7 +21,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 商品属性对象 attribute_info * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/BrandInfo.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/BrandInfo.java index 1910e7c..8def5e6 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/BrandInfo.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/BrandInfo.java @@ -18,7 +18,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 品牌信息对象 brand_info * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/CategoryInfo.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/CategoryInfo.java index b947222..44e3dba 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/CategoryInfo.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/CategoryInfo.java @@ -17,11 +17,12 @@ import com.muyu.product.domain.req.CategoryInfoEditReq; import com.muyu.common.core.web.domain.TreeEntity; import java.util.Date; +import java.util.List; /** * 品类信息对象 category_info * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data @@ -59,20 +60,6 @@ public class CategoryInfo extends TreeEntity { @Excel(name = "介绍") @ApiModelProperty(name = "介绍", value = "介绍") private String introduction; -// -// /** -// * 商品属性组关联ID -// */ -// private List attributeGroupIdList; -// /** -// * 商品属性关联ID -// */ -// private List attributeIdList; -// -// /** -// * 商品品牌组关联ID -// */ -// private List brandIdList; /** diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/CommentInfo.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/CommentInfo.java index 1d31c59..49df1bc 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/CommentInfo.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/CommentInfo.java @@ -18,7 +18,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 商品评论对象 comment_info * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/CommentLikeInfo.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/CommentLikeInfo.java index fb399de..95c2db2 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/CommentLikeInfo.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/CommentLikeInfo.java @@ -18,7 +18,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 评论点赞对象 comment_like_info * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/ProjectInfo.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/ProjectInfo.java index 2688652..f827d37 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/ProjectInfo.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/ProjectInfo.java @@ -18,7 +18,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 商品信息对象 project_info * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/ProjectSkuInfo.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/ProjectSkuInfo.java index 3ea0dcb..50e2a63 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/ProjectSkuInfo.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/ProjectSkuInfo.java @@ -19,7 +19,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 商品SKU对象 project_sku_info * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/RuleAttrInfo.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/RuleAttrInfo.java index c9460a3..12fa712 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/RuleAttrInfo.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/RuleAttrInfo.java @@ -22,7 +22,7 @@ import java.util.function.Supplier; /** * 规格详情对象 rule_attr_info * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/RuleInfo.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/RuleInfo.java index 31f6436..5e04737 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/RuleInfo.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/RuleInfo.java @@ -24,7 +24,7 @@ import java.util.function.Supplier; /** * 商品规格对象 rule_info * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/AttributeGroupSaveModel.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/AttributeGroupSaveModel.java deleted file mode 100644 index eecfb3f..0000000 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/AttributeGroupSaveModel.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.muyu.product.domain.model; - -import com.muyu.common.core.web.domain.BaseEntity; -import com.muyu.product.domain.AttributeGroup; -import com.muyu.product.domain.req.AttributeGroupSaveReq; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.util.List; - - - -/** - * @author DongZl - * @description: 属性组添加模型 - * @Date 2024-2-28 下午 03:16 - */ -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class AttributeGroupSaveModel extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** 组名称 */ - private String name; - - /** 状态 */ - private String states; - - /** - * 属性ID集合 - */ - private List attributeIdList; - - public static AttributeGroupSaveModel saveReqBuild (AttributeGroupSaveReq req){ - return AttributeGroupSaveModel.builder() - .name(req.getName()) - .states(req.getStates()) - .attributeIdList(req.getAttributeIdList()) - .build(); - } - - public AttributeGroup buildAttributeGroup () { - return AttributeGroup.builder() - .name(this.getName()) - .states(this.getStates()) - .build(); - } -} diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupEditReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupEditReq.java index 528cb09..e101994 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupEditReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupEditReq.java @@ -15,7 +15,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 属性组对象 attribute_group * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupQueryReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupQueryReq.java index 4a85156..640219c 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupQueryReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupQueryReq.java @@ -13,7 +13,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 属性组对象 attribute_group * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupSaveReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupSaveReq.java index 53266c5..1c9641a 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupSaveReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupSaveReq.java @@ -15,7 +15,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 属性组对象 attribute_group * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoEditReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoEditReq.java index 20d95cd..e7c63a5 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoEditReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoEditReq.java @@ -13,7 +13,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 商品属性对象 attribute_info * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoQueryReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoQueryReq.java index aba8144..15b6aca 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoQueryReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoQueryReq.java @@ -13,7 +13,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 商品属性对象 attribute_info * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoSaveReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoSaveReq.java index 893ddba..9861ec5 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoSaveReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoSaveReq.java @@ -13,7 +13,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 商品属性对象 attribute_info * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/BrandInfoEditReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/BrandInfoEditReq.java index 487d0c7..b2565de 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/BrandInfoEditReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/BrandInfoEditReq.java @@ -12,7 +12,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 品牌信息对象 brand_info * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/BrandInfoQueryReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/BrandInfoQueryReq.java index 5c17d05..931f387 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/BrandInfoQueryReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/BrandInfoQueryReq.java @@ -11,7 +11,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 品牌信息对象 brand_info * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/BrandInfoSaveReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/BrandInfoSaveReq.java index 15d7c84..ac5f6d5 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/BrandInfoSaveReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/BrandInfoSaveReq.java @@ -11,7 +11,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 品牌信息对象 brand_info * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CategoryInfoEditReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CategoryInfoEditReq.java index a3c9377..bf5754e 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CategoryInfoEditReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CategoryInfoEditReq.java @@ -13,7 +13,7 @@ import java.util.List; /** * 品类信息对象 category_info * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data @@ -42,4 +42,19 @@ public class CategoryInfoEditReq extends TreeEntity { private String introduction; private List cateGoryIdList; + + /** + * 品类属性组关联ID + */ + private List attributeGroupIdList; + /** + * 商品属性组关联ID + */ + private List attributeIdList; + + /** + * 商品属性组关联的ID + */ + private List brandIdList; + } diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CategoryInfoQueryReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CategoryInfoQueryReq.java index fcfbd47..f596179 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CategoryInfoQueryReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CategoryInfoQueryReq.java @@ -11,7 +11,7 @@ import com.muyu.common.core.web.domain.TreeEntity; /** * 品类信息对象 category_info * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CategoryInfoSaveReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CategoryInfoSaveReq.java index c17d122..722140c 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CategoryInfoSaveReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CategoryInfoSaveReq.java @@ -13,7 +13,7 @@ import java.util.List; /** * 品类信息对象 category_info * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentInfoEditReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentInfoEditReq.java index 58069f0..10e8939 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentInfoEditReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentInfoEditReq.java @@ -11,7 +11,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 商品评论对象 comment_info * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentInfoQueryReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentInfoQueryReq.java index 885abe8..43eaa17 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentInfoQueryReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentInfoQueryReq.java @@ -11,7 +11,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 商品评论对象 comment_info * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentInfoSaveReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentInfoSaveReq.java index a547ded..2d4aa41 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentInfoSaveReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentInfoSaveReq.java @@ -11,7 +11,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 商品评论对象 comment_info * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentLikeInfoEditReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentLikeInfoEditReq.java index 854308b..4ca9fe2 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentLikeInfoEditReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentLikeInfoEditReq.java @@ -11,7 +11,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 评论点赞对象 comment_like_info * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentLikeInfoQueryReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentLikeInfoQueryReq.java index 25737d6..c5f92af 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentLikeInfoQueryReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentLikeInfoQueryReq.java @@ -11,7 +11,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 评论点赞对象 comment_like_info * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentLikeInfoSaveReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentLikeInfoSaveReq.java index 89396ef..fcf2fe7 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentLikeInfoSaveReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentLikeInfoSaveReq.java @@ -11,7 +11,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 评论点赞对象 comment_like_info * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoEditReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoEditReq.java index f6dc539..75874e1 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoEditReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoEditReq.java @@ -11,7 +11,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 商品信息对象 project_info * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoQueryReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoQueryReq.java index 72f5185..dd748ad 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoQueryReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoQueryReq.java @@ -11,7 +11,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 商品信息对象 project_info * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoSaveReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoSaveReq.java index 8907e6d..cd210f9 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoSaveReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoSaveReq.java @@ -11,7 +11,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 商品信息对象 project_info * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectSkuInfoEditReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectSkuInfoEditReq.java index e28d898..f8c26ed 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectSkuInfoEditReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectSkuInfoEditReq.java @@ -12,7 +12,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 商品SKU对象 project_sku_info * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectSkuInfoQueryReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectSkuInfoQueryReq.java index 48e9f4f..c2d75b7 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectSkuInfoQueryReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectSkuInfoQueryReq.java @@ -12,7 +12,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 商品SKU对象 project_sku_info * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectSkuInfoSaveReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectSkuInfoSaveReq.java index 26856fc..1ee1c54 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectSkuInfoSaveReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectSkuInfoSaveReq.java @@ -12,7 +12,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 商品SKU对象 project_sku_info * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleAttrInfoEditReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleAttrInfoEditReq.java index 7f14789..5349704 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleAttrInfoEditReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleAttrInfoEditReq.java @@ -11,7 +11,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 规格详情对象 rule_attr_info * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleAttrInfoQueryReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleAttrInfoQueryReq.java index f003eb7..b4223d0 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleAttrInfoQueryReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleAttrInfoQueryReq.java @@ -11,7 +11,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 规格详情对象 rule_attr_info * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleAttrInfoSaveReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleAttrInfoSaveReq.java index d05e745..af7ca38 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleAttrInfoSaveReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleAttrInfoSaveReq.java @@ -11,7 +11,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 规格详情对象 rule_attr_info * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleInfoEditReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleInfoEditReq.java index bc9d602..1b8bb64 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleInfoEditReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleInfoEditReq.java @@ -11,7 +11,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 商品规格对象 rule_info * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleInfoQueryReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleInfoQueryReq.java index 3c50d3a..cbdd711 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleInfoQueryReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleInfoQueryReq.java @@ -11,7 +11,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 商品规格对象 rule_info * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleInfoSaveReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleInfoSaveReq.java index 2daa41b..7b606aa 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleInfoSaveReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleInfoSaveReq.java @@ -14,7 +14,7 @@ import java.util.List; /** * 商品规格对象 rule_info * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeGroupController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeGroupController.java index ef6b8e1..bd39cce 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeGroupController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeGroupController.java @@ -3,6 +3,7 @@ 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.model.AttributeGroupSaveModel; import com.muyu.product.domain.resp.AttributeGroupPageResp; import io.swagger.annotations.*; @@ -31,7 +32,7 @@ import com.muyu.common.core.web.page.TableDataInfo; /** * 属性组Controller * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Api(tags = "属性组") @@ -112,6 +113,7 @@ public class AttributeGroupController extends BaseController { @ApiOperation("删除属性组") @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = String.class, example = "1,2,3,4") public Result remove(@PathVariable List ids) { - return toAjax(attributeGroupService.removeBatchByIds(ids)); + attributeGroupService.removeBatchById(ids); + return toAjax(attributeGroupService.removeBatchById(ids)); } } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeInfoController.java index edf967d..cc90f22 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeInfoController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeInfoController.java @@ -29,7 +29,7 @@ import com.muyu.common.core.web.page.TableDataInfo; /** * 商品属性Controller * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Api(tags = "商品属性") diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/BrandInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/BrandInfoController.java index f974d5c..403287c 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/BrandInfoController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/BrandInfoController.java @@ -29,7 +29,7 @@ import com.muyu.common.core.web.page.TableDataInfo; /** * 品牌信息Controller * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Api(tags = "品牌信息") diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryInfoController.java index 12e963b..d977c33 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryInfoController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryInfoController.java @@ -1,7 +1,6 @@ package com.muyu.product.controller; import java.util.List; -import java.util.function.Supplier; import javax.servlet.http.HttpServletResponse; import com.muyu.common.security.utils.SecurityUtils; @@ -36,7 +35,7 @@ import com.muyu.product.service.CategoryInfoService; /** * 品类信息Controller * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Api(tags = "品类信息") @@ -113,6 +112,7 @@ public class CategoryInfoController extends BaseController { @PutMapping("/{id}") @ApiOperation("修改品类信息") public Result edit(@PathVariable Long id, @RequestBody CategoryInfoEditReq categoryInfoEditReq) { + categoryInfoService.utilCateGoryInfo(id,categoryInfoEditReq); return toAjax(categoryInfoService.updateById(CategoryInfo.editBuild(id,categoryInfoEditReq))); } @@ -125,7 +125,8 @@ public class CategoryInfoController extends BaseController { @ApiOperation("删除品类信息") @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = String.class, example = "1,2,3,4") public Result remove(@PathVariable List ids) { - return toAjax(categoryInfoService.removeBatchByIds(ids)); + categoryInfoService.removeBatchById(ids); + return toAjax(categoryInfoService.removeBatchById(ids)); } /** @@ -135,10 +136,11 @@ public class CategoryInfoController extends BaseController { */ @GetMapping("/parentCommonElement/{categoryId}") @ApiOperation("通过品类ID获取父级以上的属性集合") - @ApiImplicitParam(name = "categoryId", value = "categoryId", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class, example = "1") - public Result parentCommonElement( + @ApiImplicitParam(name = "categoryId",value = "categoryId",required = true,dataType = "Long",paramType = "path",dataTypeClass = Long.class,example = "1") + public Result parentCommonElementRespResult( @PathVariable(value = "categoryId") Long categoryId - ) { - return Result.success(categoryInfoService.parentCommonElement(categoryId)); + ){ + + return Result.success(categoryInfoService.parentCommonElement(categoryId)); } } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CommentInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CommentInfoController.java index 9500949..3698f3b 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CommentInfoController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CommentInfoController.java @@ -29,7 +29,7 @@ import com.muyu.common.core.web.page.TableDataInfo; /** * 商品评论Controller * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Api(tags = "商品评论") diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CommentLikeInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CommentLikeInfoController.java index 9e7b5b6..c40449a 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CommentLikeInfoController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CommentLikeInfoController.java @@ -29,7 +29,7 @@ import com.muyu.common.core.web.page.TableDataInfo; /** * 评论点赞Controller * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Api(tags = "评论点赞") diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectInfoController.java index e0fd126..e77f96e 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectInfoController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectInfoController.java @@ -29,7 +29,7 @@ import com.muyu.common.core.web.page.TableDataInfo; /** * 商品信息Controller * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Api(tags = "商品信息") diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectSkuInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectSkuInfoController.java index 38bc481..5fb16df 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectSkuInfoController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectSkuInfoController.java @@ -29,7 +29,7 @@ import com.muyu.common.core.web.page.TableDataInfo; /** * 商品SKUController * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Api(tags = "商品SKU") diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleAttrInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleAttrInfoController.java index 2ed4b7b..c8e1179 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleAttrInfoController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleAttrInfoController.java @@ -29,7 +29,7 @@ import com.muyu.common.core.web.page.TableDataInfo; /** * 规格详情Controller * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Api(tags = "规格详情") diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleInfoController.java index b30039f..e49b97d 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleInfoController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleInfoController.java @@ -31,7 +31,7 @@ import com.muyu.common.core.web.page.TableDataInfo; /** * 商品规格Controller * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Api(tags = "商品规格") diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsAttributeGroupMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsAttributeGroupMapper.java index 1b420df..8db5eb9 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsAttributeGroupMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsAttributeGroupMapper.java @@ -7,7 +7,7 @@ import com.muyu.product.domain.AsAttributeGroup; /** * 属性与组中间Mapper接口 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ public interface AsAttributeGroupMapper extends BaseMapper { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsBrandProjectMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsBrandProjectMapper.java index a78f814..ec5b469 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsBrandProjectMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsBrandProjectMapper.java @@ -7,7 +7,7 @@ import com.muyu.product.domain.AsBrandProject; /** * 品牌商品中间Mapper接口 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ public interface AsBrandProjectMapper extends BaseMapper { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsCategoryAttributeGroupMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsCategoryAttributeGroupMapper.java index b09e788..001b705 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsCategoryAttributeGroupMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsCategoryAttributeGroupMapper.java @@ -7,7 +7,7 @@ import com.muyu.product.domain.AsCategoryAttributeGroup; /** * 品类属性组中间Mapper接口 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ public interface AsCategoryAttributeGroupMapper extends BaseMapper { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsCategoryAttributeMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsCategoryAttributeMapper.java index 66c2e87..a6470b9 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsCategoryAttributeMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsCategoryAttributeMapper.java @@ -7,7 +7,7 @@ import com.muyu.product.domain.AsCategoryAttribute; /** * 品类属性中间Mapper接口 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ public interface AsCategoryAttributeMapper extends BaseMapper { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsCategoryBrandMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsCategoryBrandMapper.java index 3e8c164..1e59419 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsCategoryBrandMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsCategoryBrandMapper.java @@ -7,7 +7,7 @@ import com.muyu.product.domain.AsCategoryBrand; /** * 品类品牌中间Mapper接口 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ public interface AsCategoryBrandMapper extends BaseMapper { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsProductAttributeInfoMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsProductAttributeInfoMapper.java index 4350c22..328d3d4 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsProductAttributeInfoMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsProductAttributeInfoMapper.java @@ -7,7 +7,7 @@ import com.muyu.product.domain.AsProductAttributeInfo; /** * 商品属性Mapper接口 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ public interface AsProductAttributeInfoMapper extends BaseMapper { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeGroupMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeGroupMapper.java index 9f1acd3..481fc07 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeGroupMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeGroupMapper.java @@ -7,7 +7,7 @@ import com.muyu.product.domain.AttributeGroup; /** * 属性组Mapper接口 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ public interface AttributeGroupMapper extends BaseMapper { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeInfoMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeInfoMapper.java index 8d00d2e..8a3d2fa 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeInfoMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeInfoMapper.java @@ -7,7 +7,7 @@ import com.muyu.product.domain.AttributeInfo; /** * 商品属性Mapper接口 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ public interface AttributeInfoMapper extends BaseMapper { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/BrandInfoMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/BrandInfoMapper.java index 97519e1..f6d2741 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/BrandInfoMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/BrandInfoMapper.java @@ -7,7 +7,7 @@ import com.muyu.product.domain.BrandInfo; /** * 品牌信息Mapper接口 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ public interface BrandInfoMapper extends BaseMapper { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CategoryInfoMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CategoryInfoMapper.java index 6ed8f75..1743a83 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CategoryInfoMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CategoryInfoMapper.java @@ -7,7 +7,7 @@ import com.muyu.product.domain.CategoryInfo; /** * 品类信息Mapper接口 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ public interface CategoryInfoMapper extends BaseMapper { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CommentInfoMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CommentInfoMapper.java index 9badc38..497ea2c 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CommentInfoMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CommentInfoMapper.java @@ -7,7 +7,7 @@ import com.muyu.product.domain.CommentInfo; /** * 商品评论Mapper接口 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ public interface CommentInfoMapper extends BaseMapper { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CommentLikeInfoMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CommentLikeInfoMapper.java index 8b28651..c7b7317 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CommentLikeInfoMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CommentLikeInfoMapper.java @@ -7,7 +7,7 @@ import com.muyu.product.domain.CommentLikeInfo; /** * 评论点赞Mapper接口 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ public interface CommentLikeInfoMapper extends BaseMapper { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProjectInfoMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProjectInfoMapper.java index 2eb6558..85f0f91 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProjectInfoMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProjectInfoMapper.java @@ -7,7 +7,7 @@ import com.muyu.product.domain.ProjectInfo; /** * 商品信息Mapper接口 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ public interface ProjectInfoMapper extends BaseMapper { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProjectSkuInfoMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProjectSkuInfoMapper.java index 040cb21..2ad0192 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProjectSkuInfoMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProjectSkuInfoMapper.java @@ -7,7 +7,7 @@ import com.muyu.product.domain.ProjectSkuInfo; /** * 商品SKUMapper接口 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ public interface ProjectSkuInfoMapper extends BaseMapper { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/RuleAttrInfoMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/RuleAttrInfoMapper.java index b51378c..28509d2 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/RuleAttrInfoMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/RuleAttrInfoMapper.java @@ -7,7 +7,7 @@ import com.muyu.product.domain.RuleAttrInfo; /** * 规格详情Mapper接口 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ public interface RuleAttrInfoMapper extends BaseMapper { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/RuleInfoMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/RuleInfoMapper.java index 497a29a..feb1b93 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/RuleInfoMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/RuleInfoMapper.java @@ -7,7 +7,7 @@ import com.muyu.product.domain.RuleInfo; /** * 商品规格Mapper接口 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ public interface RuleInfoMapper extends BaseMapper { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsAttributeGroupService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsAttributeGroupService.java index 1297b37..f420ff6 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsAttributeGroupService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsAttributeGroupService.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * 属性与组中间Service接口 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ public interface AsAttributeGroupService extends IService { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsBrandProjectService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsBrandProjectService.java index b30f7c2..5e417f7 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsBrandProjectService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsBrandProjectService.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * 品牌商品中间Service接口 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ public interface AsBrandProjectService extends IService { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsCategoryAttributeGroupService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsCategoryAttributeGroupService.java index fb3b15f..8207d9a 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsCategoryAttributeGroupService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsCategoryAttributeGroupService.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * 品类属性组中间Service接口 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ public interface AsCategoryAttributeGroupService extends IService { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsCategoryAttributeService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsCategoryAttributeService.java index 365d74b..c841456 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsCategoryAttributeService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsCategoryAttributeService.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * 品类属性中间Service接口 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ public interface AsCategoryAttributeService extends IService { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsCategoryBrandService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsCategoryBrandService.java index a1ccaa9..685f834 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsCategoryBrandService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsCategoryBrandService.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * 品类品牌中间Service接口 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ public interface AsCategoryBrandService extends IService { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsProductAttributeInfoService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsProductAttributeInfoService.java index 152bb77..d074413 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsProductAttributeInfoService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsProductAttributeInfoService.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * 商品属性Service接口 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ public interface AsProductAttributeInfoService extends IService { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AttributeGroupService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AttributeGroupService.java index 013c510..ded1b64 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AttributeGroupService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AttributeGroupService.java @@ -5,15 +5,15 @@ import java.util.List; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.product.domain.AttributeGroup; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.product.domain.AttributeInfo; import com.muyu.product.domain.model.AttributeGroupSaveModel; import com.muyu.product.domain.req.AttributeGroupEditReq; import com.muyu.product.domain.resp.AttributeGroupPageResp; +import org.apache.ibatis.annotations.Param; /** * 属性组Service接口 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ public interface AttributeGroupService extends IService { @@ -41,4 +41,6 @@ public interface AttributeGroupService extends IService { public Boolean save(AttributeGroupSaveModel attributeGroupSaveModel); void updateAsAttributGrop(AttributeGroupEditReq attributeGroupEditReq, Long groupId); + + Boolean removeBatchById(List ids); } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AttributeInfoService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AttributeInfoService.java index 14d9431..c8abede 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AttributeInfoService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AttributeInfoService.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * 商品属性Service接口 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ public interface AttributeInfoService extends IService { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/BrandInfoService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/BrandInfoService.java index 59b6595..3f952df 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/BrandInfoService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/BrandInfoService.java @@ -8,7 +8,7 @@ import com.muyu.product.domain.req.BrandInfoEditReq; /** * 品牌信息Service接口 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ public interface BrandInfoService extends IService { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CategoryInfoService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CategoryInfoService.java index 06504c0..23f656a 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CategoryInfoService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CategoryInfoService.java @@ -15,7 +15,7 @@ import com.muyu.product.domain.resp.CategoryParentCommonElementResp; /** * 品类信息Service接口 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ public interface CategoryInfoService extends IService { @@ -30,17 +30,16 @@ public interface CategoryInfoService extends IService { CategoryParentCommonElementResp parentCommonElement(Long categoryId); - void util(CategoryInfoEditReq categoryInfoEditReq, Long id); public boolean save(CategoryInfoSaveModel categoryInfoSaveModel); - List getAttributeGroup(Long categoryId); - - List getBrand(Long categoryId); - - List getAttribute(Long categoryId); - - CategoryParentCommonElementResp paretCoommonElement(Long categoryId); +// List getAttributeGroup(Long categoryId); +// +// List getBrand(Long categoryId); +// +// List getAttribute(Long categoryId); +// +// CategoryParentCommonElementResp paretCoommonElement(Long categoryId); /** * 品类共有属性 @@ -48,4 +47,8 @@ public interface CategoryInfoService extends IService { * @return */ CategoryCommonElementResp getTemplateAttributeByCateGoryId(Long cateGoryId); + + void utilCateGoryInfo(Long id, CategoryInfoEditReq categoryInfoEditReq); + + Boolean removeBatchById(List ids); } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CommentInfoService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CommentInfoService.java index 54fbcca..1ea8781 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CommentInfoService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CommentInfoService.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * 商品评论Service接口 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ public interface CommentInfoService extends IService { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CommentLikeInfoService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CommentLikeInfoService.java index 4c72f34..bad43db 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CommentLikeInfoService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CommentLikeInfoService.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * 评论点赞Service接口 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ public interface CommentLikeInfoService extends IService { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ProjectInfoService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ProjectInfoService.java index f4ea950..950599a 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ProjectInfoService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ProjectInfoService.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * 商品信息Service接口 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ public interface ProjectInfoService extends IService { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ProjectSkuInfoService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ProjectSkuInfoService.java index 3706c08..dda27bc 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ProjectSkuInfoService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ProjectSkuInfoService.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * 商品SKUService接口 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ public interface ProjectSkuInfoService extends IService { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/RuleAttrInfoService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/RuleAttrInfoService.java index e71e8d8..db739cc 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/RuleAttrInfoService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/RuleAttrInfoService.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * 规格详情Service接口 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ public interface RuleAttrInfoService extends IService { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/RuleInfoService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/RuleInfoService.java index 8262f8d..f082fc3 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/RuleInfoService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/RuleInfoService.java @@ -13,7 +13,7 @@ import com.muyu.product.domain.resp.RuleInfoResp; /** * 商品规格Service接口 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ public interface RuleInfoService extends IService { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsAttributeGroupServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsAttributeGroupServiceImpl.java index 62e469e..053ffba 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsAttributeGroupServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsAttributeGroupServiceImpl.java @@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; /** * 属性与组中间Service业务层处理 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Slf4j diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsBrandProjectServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsBrandProjectServiceImpl.java index e5c906d..472d71a 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsBrandProjectServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsBrandProjectServiceImpl.java @@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; /** * 品牌商品中间Service业务层处理 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Slf4j diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsCategoryAttributeGroupServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsCategoryAttributeGroupServiceImpl.java index a279181..59d9aa8 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsCategoryAttributeGroupServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsCategoryAttributeGroupServiceImpl.java @@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; /** * 品类属性组中间Service业务层处理 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Slf4j diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsCategoryAttributeServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsCategoryAttributeServiceImpl.java index 48e263d..b67f624 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsCategoryAttributeServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsCategoryAttributeServiceImpl.java @@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; /** * 品类属性中间Service业务层处理 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Slf4j diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsCategoryBrandServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsCategoryBrandServiceImpl.java index ec71806..1eb7654 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsCategoryBrandServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsCategoryBrandServiceImpl.java @@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; /** * 品类品牌中间Service业务层处理 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Slf4j diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsProductAttributeInfoServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsProductAttributeInfoServiceImpl.java index 2cc3206..970d31b 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsProductAttributeInfoServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsProductAttributeInfoServiceImpl.java @@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; /** * 商品属性Service业务层处理 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Slf4j diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeGroupServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeGroupServiceImpl.java index f318ca6..1e53667 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeGroupServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeGroupServiceImpl.java @@ -7,10 +7,10 @@ import com.muyu.common.core.utils.ObjUtils; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.product.domain.AsAttributeGroup; import com.muyu.product.domain.AttributeGroup; -import com.muyu.product.domain.AttributeInfo; import com.muyu.product.domain.model.AttributeGroupSaveModel; import com.muyu.product.domain.req.AttributeGroupEditReq; import com.muyu.product.domain.resp.AttributeGroupPageResp; +import com.muyu.product.mapper.AsAttributeGroupMapper; import com.muyu.product.mapper.AttributeGroupMapper; import com.muyu.product.service.AsAttributeGroupService; import com.muyu.product.service.AttributeGroupService; @@ -22,13 +22,12 @@ import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; -import java.util.function.Function; -import java.util.stream.Stream; +import java.util.Spliterator; /** * 属性组Service业务层处理 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Slf4j @@ -128,4 +127,16 @@ public class AttributeGroupServiceImpl extends ServiceImpl ids) { + LambdaQueryWrapper asAttributeGroupLambdaQueryWrapper = new LambdaQueryWrapper<>(); + asAttributeGroupLambdaQueryWrapper.in(AsAttributeGroup::getGroupId, ids); + asAttributeGroupMapper.delete(asAttributeGroupLambdaQueryWrapper); + return null; + } + + } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeInfoServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeInfoServiceImpl.java index cfa5de5..de45cbd 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeInfoServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeInfoServiceImpl.java @@ -18,7 +18,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; /** * 商品属性Service业务层处理 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Slf4j diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/BrandInfoServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/BrandInfoServiceImpl.java index f7d1ce8..27244e3 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/BrandInfoServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/BrandInfoServiceImpl.java @@ -20,7 +20,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; /** * 品牌信息Service业务层处理 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Slf4j diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CategoryInfoServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CategoryInfoServiceImpl.java index 67062b4..6d7007d 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CategoryInfoServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CategoryInfoServiceImpl.java @@ -13,6 +13,9 @@ import com.muyu.product.domain.model.TemplateAttributeModel; import com.muyu.product.domain.req.CategoryInfoEditReq; import com.muyu.product.domain.resp.CategoryCommonElementResp; import com.muyu.product.domain.resp.CategoryParentCommonElementResp; +import com.muyu.product.mapper.AsCategoryAttributeGroupMapper; +import com.muyu.product.mapper.AsCategoryAttributeMapper; +import com.muyu.product.mapper.AsCategoryBrandMapper; import com.muyu.product.mapper.CategoryInfoMapper; import com.muyu.product.service.*; import lombok.extern.slf4j.Slf4j; @@ -30,7 +33,7 @@ import java.util.stream.Stream; /** * 品类信息Service业务层处理 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Slf4j @@ -69,34 +72,47 @@ public class CategoryInfoServiceImpl extends ServiceImpl list (CategoryInfo categoryInfo) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (ObjUtils.notNull(categoryInfo.getName())){ + queryWrapper.like(CategoryInfo::getName,categoryInfo.getName()); + } + if (ObjUtils.notNull(categoryInfo.getImage())){ + queryWrapper.eq(CategoryInfo::getImage,categoryInfo.getImage()); + } - if (ObjUtils.notNull(categoryInfo.getName())) { - queryWrapper.like(CategoryInfo::getName, categoryInfo.getName()); - } + if (ObjUtils.notNull(categoryInfo.getParentId())){ + queryWrapper.eq(CategoryInfo::getParentId,categoryInfo.getParentId()); + } - if (ObjUtils.notNull(categoryInfo.getImage())) { - queryWrapper.eq(CategoryInfo::getImage, categoryInfo.getImage()); - } + if (ObjUtils.notNull(categoryInfo.getStart())){ + queryWrapper.eq(CategoryInfo::getStart,categoryInfo.getStart()); + } - if (ObjUtils.notNull(categoryInfo.getParentId())) { - queryWrapper.eq(CategoryInfo::getParentId, categoryInfo.getParentId()); - } - - if (ObjUtils.notNull(categoryInfo.getStart())) { - queryWrapper.eq(CategoryInfo::getStart, categoryInfo.getStart()); - } - - if (ObjUtils.notNull(categoryInfo.getIntroduction())) { - queryWrapper.eq(CategoryInfo::getIntroduction, categoryInfo.getIntroduction()); + if (ObjUtils.notNull(categoryInfo.getIntroduction())){ + queryWrapper.eq(CategoryInfo::getIntroduction,categoryInfo.getIntroduction()); } return list(queryWrapper); } + /** + * + * @param categoryId 品类ID + * @return 父级以上的属性.属性组.品牌集合 + */ + @Override //通过品类ID获取父级以上的属性,属性组,品牌集 + public CategoryParentCommonElementResp parentCommonElement(Long categoryId) { + return CategoryParentCommonElementResp.builder() + .attributeInfoList(getCommon(categoryId,asCategoryAttributeService,attributeInfoService)) + .attributeGroupList(getCommon(categoryId,asCategoryAttributeGroupService,attributeGroupService)) + .brandInfoList(getCommon(categoryId,asCategoryBrandService,brandInfoService)) + .build(); + } + @Override @Transactional public boolean save (CategoryInfoSaveModel categoryInfoSaveModel) { + CategoryInfo categoryInfo = CategoryInfo.saveModelBuild(categoryInfoSaveModel); boolean save = this.save(categoryInfo); Long categoryInfoId = categoryInfo.getId(); @@ -104,7 +120,7 @@ public class CategoryInfoServiceImpl extends ServiceImpl AsCategoryAttribute.categoryBuild(categoryInfoId, attributeId)) + .map(attributeId -> AsCategoryAttribute.categoryBuildtwo(categoryInfoId,attributeId)) .toList() ); } @@ -127,116 +143,111 @@ public class CategoryInfoServiceImpl extends ServiceImpl getAttributeGroup (Long categoryId) { - List attributeGroupList = new ArrayList<>(); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(AsCategoryAttributeGroup::getCategoryId, categoryId); - List asCategoryAttributeGroupList = asCategoryAttributeGroupService.list(queryWrapper); - if (asCategoryAttributeGroupList != null && !asCategoryAttributeGroupList.isEmpty()) { - List attributeGroupIdList = asCategoryAttributeGroupList.stream() - .map(AsCategoryAttributeGroup::getAttributeGroupId) - .toList(); - attributeGroupList.addAll(attributeGroupService.listByIds(attributeGroupIdList)); - } - CategoryInfo categoryInfo = this.getById(categoryId); - if (categoryInfo.getParentId() != 0) { - if (attributeGroupList.isEmpty()) { - attributeGroupList.addAll(getAttributeGroup(categoryInfo.getParentId())); - } else { - List attributeGroups = getAttributeGroup(categoryInfo.getParentId()); - attributeGroups.forEach(attributeGroup -> { - if (!attributeGroupList.contains(attributeGroup)) { - attributeGroupList.add(attributeGroup); - } - }); - } - } - return attributeGroupList; - } - - /** - * 通过品类ID获取父级以上的品牌集合 - * - * @param categoryId 品类ID - * - * @return 父级以上的品牌集合 - */ - @Override - public List getBrand (Long categoryId) { - List brandInfoList = new ArrayList<>(); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(AsCategoryBrand::getCategoryId, categoryId); - List asCategoryBrandList = asCategoryBrandService.list(queryWrapper); - if (asCategoryBrandList != null && !asCategoryBrandList.isEmpty()) { - List brandIdList = asCategoryBrandList.stream() - .map(AsCategoryBrand::getBrandId) - .toList(); - brandInfoList.addAll(brandInfoService.listByIds(brandIdList)); - } - CategoryInfo categoryInfo = this.getById(categoryId); - if (categoryInfo.getParentId() != 0) { - if (brandInfoList.isEmpty()) { - brandInfoList.addAll(getBrand(categoryInfo.getParentId())); - } else { - List brandInfos = getBrand(categoryInfo.getParentId()); - brandInfos.forEach(brandInfo -> { - if (!brandInfoList.contains(brandInfo)) { - brandInfoList.add(brandInfo); - } - }); - } - - } - return brandInfoList; - } - - /** - * 通过品类ID获取父级以上的属性集合 - * - * @param categoryId 品类ID - * - * @return 父级以上的属性集合 - */ - @Override - public List getAttribute (Long categoryId) { - List attributeInfoList = new ArrayList<>(); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(AsCategoryAttribute::getCategoryId, categoryId); - List asCategoryAttributeList = asCategoryAttributeService.list(queryWrapper); - if (asCategoryAttributeList != null && !asCategoryAttributeList.isEmpty()) { - List attributeIdList = asCategoryAttributeList.stream() - .map(AsCategoryAttribute::getAttributeId) - .toList(); - attributeInfoList.addAll(attributeInfoService.listByIds(attributeIdList)); - } - CategoryInfo categoryInfo = this.getById(categoryId); - if (categoryInfo.getParentId() != 0) { - if (attributeInfoList.isEmpty()) { - attributeInfoList.addAll(getAttribute(categoryInfo.getParentId())); - } else { - List attributeInfos = getAttribute(categoryInfo.getParentId()); - attributeInfos.forEach(attributeInfoQuery -> { - if (!attributeInfoList.contains(attributeInfoQuery)) { - attributeInfoList.add(attributeInfoQuery); - } - }); - } - } - return attributeInfoList; - } - - @Override - public CategoryParentCommonElementResp paretCoommonElement(Long categoryId) { - return null; - } +// /** +// * 通过品类ID获取父级以上的属性组集合 +// * +// * @param categoryId 品类ID +// * +// * @return 父级以上的属性组集合 +// */ +// @Override +// public List getAttributeGroup (Long categoryId) { +// List attributeGroupList = new ArrayList<>(); +// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); +// queryWrapper.eq(AsCategoryAttributeGroup::getCategoryId, categoryId); +// List asCategoryAttributeGroupList = asCategoryAttributeGroupService.list(queryWrapper); +// if (asCategoryAttributeGroupList != null && !asCategoryAttributeGroupList.isEmpty()) { +// List attributeGroupIdList = asCategoryAttributeGroupList.stream() +// .map(AsCategoryAttributeGroup::getAttributeGroupId) +// .toList(); +// attributeGroupList.addAll(attributeGroupService.listByIds(attributeGroupIdList)); +// } +// CategoryInfo categoryInfo = this.getById(categoryId); +// if (categoryInfo.getParentId() != 0) { +// if (attributeGroupList.isEmpty()) { +// attributeGroupList.addAll(getAttributeGroup(categoryInfo.getParentId())); +// } else { +// List attributeGroups = getAttributeGroup(categoryInfo.getParentId()); +// attributeGroups.forEach(attributeGroup -> { +// if (!attributeGroupList.contains(attributeGroup)) { +// attributeGroupList.add(attributeGroup); +// } +// }); +// } +// } +// return attributeGroupList; +// } +// +// /** +// * 通过品类ID获取父级以上的品牌集合 +// * +// * @param categoryId 品类ID +// * +// * @return 父级以上的品牌集合 +// */ +// @Override +// public List getBrand (Long categoryId) { +// List brandInfoList = new ArrayList<>(); +// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); +// queryWrapper.eq(AsCategoryBrand::getCategoryId, categoryId); +// List asCategoryBrandList = asCategoryBrandService.list(queryWrapper); +// if (asCategoryBrandList != null && !asCategoryBrandList.isEmpty()) { +// List brandIdList = asCategoryBrandList.stream() +// .map(AsCategoryBrand::getBrandId) +// .toList(); +// brandInfoList.addAll(brandInfoService.listByIds(brandIdList)); +// } +// CategoryInfo categoryInfo = this.getById(categoryId); +// if (categoryInfo.getParentId() != 0) { +// if (brandInfoList.isEmpty()) { +// brandInfoList.addAll(getBrand(categoryInfo.getParentId())); +// } else { +// List brandInfos = getBrand(categoryInfo.getParentId()); +// brandInfos.forEach(brandInfo -> { +// if (!brandInfoList.contains(brandInfo)) { +// brandInfoList.add(brandInfo); +// } +// }); +// } +// +// } +// return brandInfoList; +// } +// +// /** +// * 通过品类ID获取父级以上的属性集合 +// * +// * @param categoryId 品类ID +// * +// * @return 父级以上的属性集合 +// */ +// @Override +// public List getAttribute (Long categoryId) { +// List attributeInfoList = new ArrayList<>(); +// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); +// queryWrapper.eq(AsCategoryAttribute::getCategoryId, categoryId); +// List asCategoryAttributeList = asCategoryAttributeService.list(queryWrapper); +// if (asCategoryAttributeList != null && !asCategoryAttributeList.isEmpty()) { +// List attributeIdList = asCategoryAttributeList.stream() +// .map(AsCategoryAttribute::getAttributeId) +// .toList(); +// attributeInfoList.addAll(attributeInfoService.listByIds(attributeIdList)); +// } +// CategoryInfo categoryInfo = this.getById(categoryId); +// if (categoryInfo.getParentId() != 0) { +// if (attributeInfoList.isEmpty()) { +// attributeInfoList.addAll(getAttribute(categoryInfo.getParentId())); +// } else { +// List attributeInfos = getAttribute(categoryInfo.getParentId()); +// attributeInfos.forEach(attributeInfoQuery -> { +// if (!attributeInfoList.contains(attributeInfoQuery)) { +// attributeInfoList.add(attributeInfoQuery); +// } +// }); +// } +// } +// return attributeInfoList; +// } public List getCommon (Long categoryId, IService iService, IService bsiService) { @@ -271,26 +282,7 @@ public class CategoryInfoServiceImpl extends ServiceImpl parentIdList, Long cateGoryId){ if (cateGoryId.equals(0L)){ @@ -381,4 +373,82 @@ public class CategoryInfoServiceImpl extends ServiceImpl list = asCategoryAttributeService.list(asCategoryAttributeGroup); + ArrayList longs = new ArrayList<>(); + for (AsCategoryAttribute asCategoryAttribute : list) { + longs.add(asCategoryAttribute.getId()); + } + asCategoryAttributeService.removeBatchByIds(longs); + List attributeGroupIdList = categoryInfoEditReq.getAttributeGroupIdList(); + asCategoryAttributeService.saveBatch( + attributeGroupIdList.stream() + .map(aLong -> AsCategoryAttribute.categoryBuild(id,aLong)) + .toList() + ); + + AsCategoryAttributeGroup asCategoryAttribute = AsCategoryAttributeGroup.cateBuild(id); + List categoryAttributeGroupList = asCategoryAttributeGroupService.list(asCategoryAttribute); + ArrayList arrayList = new ArrayList<>(); + for (AsCategoryAttributeGroup categoryAttributeGroup : categoryAttributeGroupList) { + arrayList.add(categoryAttributeGroup.getId()); + } + asCategoryAttributeGroupService.removeBatchByIds(arrayList); + List reqAttributeGroupIdList = categoryInfoEditReq.getAttributeGroupIdList(); + asCategoryAttributeGroupService.saveBatch( + reqAttributeGroupIdList.stream() + .map(aLong -> + AsCategoryAttributeGroup.categoryBuild(id,aLong) + ).toList() + ); + AsCategoryBrand asCategoryBrand = AsCategoryBrand.categoryBrand(id); + List asCategoryBrands = asCategoryBrandService.list(asCategoryBrand); + ArrayList longArrayList = new ArrayList<>(); + for (AsCategoryBrand categoryBrand : asCategoryBrands) { + longArrayList.add(categoryBrand.getId()); + } + asCategoryBrandService.removeBatchByIds(longArrayList); + List brandIdList = categoryInfoEditReq.getBrandIdList(); + asCategoryBrandService.saveBatch( + brandIdList.stream() + .map(aLong -> + AsCategoryBrand.categoryBuild(id,aLong)) + .toList() + ); + + + + } +@Autowired +private AsCategoryAttributeGroupMapper asCategoryAttributeGroupMapper; + @Autowired + private AsCategoryAttributeMapper asCategoryAttributeMapper; + + @Autowired + private AsCategoryBrandMapper asCategoryBrandMapper; + @Override + public Boolean removeBatchById(List ids) { + //删除品类属性组中间表 + LambdaQueryWrapper asCategoryAttributeGroupLambdaQueryWrapper = new LambdaQueryWrapper<>(); + asCategoryAttributeGroupLambdaQueryWrapper.in(AsCategoryAttributeGroup::getAttributeGroupId, ids); + asCategoryAttributeGroupMapper.delete(asCategoryAttributeGroupLambdaQueryWrapper); + //删除品类属性中间表 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(AsCategoryAttribute::getAttributeId, ids); + asCategoryAttributeMapper.delete(queryWrapper); + + //删除品类品牌中间 + LambdaQueryWrapper brandLambdaQueryWrapper = new LambdaQueryWrapper<>(); + brandLambdaQueryWrapper.in(AsCategoryBrand::getBrandId, ids); + asCategoryBrandMapper.delete(brandLambdaQueryWrapper); + return true; + } + + } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CommentInfoServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CommentInfoServiceImpl.java index 365a5c4..185f287 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CommentInfoServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CommentInfoServiceImpl.java @@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; /** * 商品评论Service业务层处理 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Slf4j diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CommentLikeInfoServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CommentLikeInfoServiceImpl.java index ae7f281..d1ba9b9 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CommentLikeInfoServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CommentLikeInfoServiceImpl.java @@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; /** * 评论点赞Service业务层处理 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Slf4j 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 37d05e1..4ab27c2 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 @@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; /** * 商品信息Service业务层处理 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Slf4j diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProjectSkuInfoServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProjectSkuInfoServiceImpl.java index ed42d5c..d121632 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProjectSkuInfoServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProjectSkuInfoServiceImpl.java @@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; /** * 商品SKUService业务层处理 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Slf4j diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleAttrInfoServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleAttrInfoServiceImpl.java index ec1b4f1..562fa9f 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleAttrInfoServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleAttrInfoServiceImpl.java @@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; /** * 规格详情Service业务层处理 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Slf4j diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleInfoServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleInfoServiceImpl.java index 12b3ac0..62d562b 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleInfoServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleInfoServiceImpl.java @@ -5,6 +5,7 @@ import java.util.function.Function; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageInfo; +import com.muyu.common.core.text.Convert; import com.muyu.common.core.utils.ObjUtils; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.security.utils.SecurityUtils; @@ -27,7 +28,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; /** * 商品规格Service业务层处理 * - * @author DongZeLiang + * @author YangLe * @date 2024-02-27 */ @Slf4j @@ -77,18 +78,19 @@ public class RuleInfoServiceImpl extends ServiceImpl @Override public boolean save(RuleInfoAddModel ruleInfoAddModel) { - RuleInfo ruleInfo = RuleInfo.addModelBuild(ruleInfoAddModel, SystemUtils::getUserName); + RuleInfo ruleInfo = RuleInfo.addModelBuild(ruleInfoAddModel, SecurityUtils::getUsername); boolean save = this.save(ruleInfo); ruleAttrInfoService.saveBatch( ruleInfoAddModel.getRuleAttrList().stream() - .map(ruleAttrAddModel ->RuleAttrInfo.addMoudelBuild(ruleAttrAddModel,ruleInfo::getId, SecurityUtils::getUsername) ) - .toList() + .map(ruleAttrAddModel -> + RuleAttrInfo.addMoudelBuild(ruleAttrAddModel,ruleInfo::getId,SecurityUtils::getUsername) + ).toList() ); - return save; + return false; } @Override - public TableDataInfo queryList (RuleInfoQueryReq ruleInfoQueryReq) { + public TableDataInfo queryList(RuleInfoQueryReq ruleInfoQueryReq) { List list = this.list(RuleInfo.queryBuild(ruleInfoQueryReq)); List ruleInfoRespList = list.stream() .map(ruleInfo -> RuleInfoResp.infoBuild(ruleInfo, ruleId -> { @@ -97,12 +99,41 @@ public class RuleInfoServiceImpl extends ServiceImpl return ruleAttrInfoService.list(queryWrapper).stream().map(RuleAttrAddModel::infoBuild).toList(); })) .toList(); - + boolean isPage= ruleInfoQueryReq.getParams().get("isPage")==null || Convert.toBool(ruleInfoQueryReq.getParams().get("isPage")); return TableDataInfo.builder() .rows(ruleInfoRespList) - .total(new PageInfo<>(list).getTotal()) + .total(isPage ? new PageInfo<>(list).getTotal() : 0) .build(); } +// @Override +// public boolean save(RuleInfoAddModel ruleInfoAddModel) { +// RuleInfo ruleInfo = RuleInfo.addModelBuild(ruleInfoAddModel, SystemUtils::getUserName); +// boolean save = this.save(ruleInfo); +// ruleAttrInfoService.saveBatch( +// ruleInfoAddModel.getRuleAttrList().stream() +// .map(ruleAttrAddModel ->RuleAttrInfo.addMoudelBuild(ruleAttrAddModel,ruleInfo::getId, SecurityUtils::getUsername) ) +// .toList() +// ); +// return save; +// } +// +// @Override +// public TableDataInfo queryList (RuleInfoQueryReq ruleInfoQueryReq) { +// List list = this.list(RuleInfo.queryBuild(ruleInfoQueryReq)); +// List ruleInfoRespList = list.stream() +// .map(ruleInfo -> RuleInfoResp.infoBuild(ruleInfo, ruleId -> { +// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); +// queryWrapper.eq(RuleAttrInfo::getRuleId, ruleId); +// return ruleAttrInfoService.list(queryWrapper).stream().map(RuleAttrAddModel::infoBuild).toList(); +// })) +// .toList(); +// +// return TableDataInfo.builder() +// .rows(ruleInfoRespList) +// .total(new PageInfo<>(list).getTotal()) +// .build(); +// } + }