From 7eaf458690327c569b6c8eb8c68fff1e5bcb6483 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=88=90=E8=8B=B1=E6=9D=B0?= <3427731738@qq.com> Date: Thu, 5 Dec 2024 09:43:06 +0800 Subject: [PATCH] 2204A-cyj --- .../marketing/domain/ActivityTeamInfo.java | 1 - .../model/ActivityTeamInfoSelectModel.java | 2 - .../model/ActivityTeamInfoUpdModel.java | 5 - .../model/ActivityTeamProductSkuModel.java | 1 - .../ActivityTeamProductSkuSettingModel.java | 2 - .../model/ActivityTeamProductSkuUpdModel.java | 1 - .../ActivityTeamProductUpdCheckModel.java | 2 - .../req/ActivityTeamProductSkuInfoUpdReq.java | 4 - .../req/ActivityTeamProductSkuSettingReq.java | 1 - .../domain/resp/ProjectFindSkuInfoResp.java | 2 - .../controller/ActivityTeamController.java | 1 + .../ActivityTeamProductSkuInfoMapper.java | 3 +- .../mapper/TeamStrategyExemptionMapper.java | 3 +- .../team/service/ActivityTeamInfoService.java | 1 - .../service/ActivityTeamOpenInfoService.java | 1 - .../impl/ActivityTeamInfoServiceImpl.java | 2 - ...ActivityTeamProductSkuInfoServiceImpl.java | 4 - .../muyu/product/domain/ProductCategory.java | 56 ++++++++ .../domain/model/TemplateAttributeModel.java | 2 + .../domain/req/AttributeGroupEditReq.java | 7 + .../domain/req/AttributeGroupStateReq.java | 24 ++++ .../domain/req/CategoryInfoEditReq.java | 19 +++ .../domain/req/CategoryInfoSaveReq.java | 2 +- .../domain/req/ProjectInfoEditReq.java | 27 +++- .../product/domain/req/ProjectInfoUpdReq.java | 37 +++++ .../domain/req/WyzRuleInfoSaveReq.java | 15 ++ .../domain/resp/AttributeGroupUpd.java | 31 +++++ .../domain/resp/CategoryInfoUpdResp.java | 63 +++++++++ .../domain/resp/ProductCategoryResp.java | 35 +++++ .../domain/resp/ProjectInfoListResp.java | 129 ++++++++++++++++++ .../controller/AttributeGroupController.java | 44 +++--- .../controller/AttributeInfoController.java | 25 ++-- .../controller/BrandInfoController.java | 26 ++-- .../controller/CategoryInfoController.java | 40 ++---- .../controller/CommentInfoController.java | 25 ++-- .../controller/CommentLikeInfoController.java | 25 ++-- .../controller/ProjectInfoController.java | 40 +++--- .../controller/ProjectSkuInfoController.java | 25 ++-- .../controller/RuleAttrInfoController.java | 25 ++-- .../controller/RuleInfoController.java | 33 ++--- .../mapper/AsAttributeGroupMapper.java | 8 +- .../product/mapper/AsBrandProjectMapper.java | 1 - .../AsCategoryAttributeGroupMapper.java | 19 ++- .../mapper/AsCategoryAttributeMapper.java | 22 ++- .../product/mapper/AsCategoryBrandMapper.java | 20 ++- .../mapper/AsProductAttributeInfoMapper.java | 1 - .../product/mapper/AttributeGroupMapper.java | 3 +- .../product/mapper/AttributeInfoMapper.java | 1 - .../muyu/product/mapper/BrandInfoMapper.java | 1 - .../product/mapper/CategoryInfoMapper.java | 10 +- .../product/mapper/CommentInfoMapper.java | 1 - .../product/mapper/CommentLikeInfoMapper.java | 1 - .../product/mapper/ProjectInfoMapper.java | 3 +- .../product/mapper/ProjectSkuInfoMapper.java | 1 - .../product/mapper/RuleAttrInfoMapper.java | 1 - .../muyu/product/mapper/RuleInfoMapper.java | 3 +- .../service/AttributeGroupService.java | 20 +++ .../product/service/CategoryInfoService.java | 15 ++ .../product/service/ProjectInfoService.java | 14 +- .../product/service/RuleAttrInfoService.java | 5 + .../muyu/product/service/RuleInfoService.java | 2 + .../impl/AttributeGroupServiceImpl.java | 90 ++++++++++++ .../service/impl/CategoryInfoServiceImpl.java | 99 ++++++++++++++ .../service/impl/ProjectInfoServiceImpl.java | 85 +++++++++++- .../service/impl/RuleAttrInfoServiceImpl.java | 21 +++ .../mapper/product/AsAttributeGroupMapper.xml | 9 ++ .../AsCategoryAttributeGroupMapper.xml | 14 ++ .../product/AsCategoryAttributeMapper.xml | 24 +++- .../mapper/product/AsCategoryBrandMapper.xml | 13 ++ .../mapper/product/CategoryInfoMapper.xml | 24 ++++ 70 files changed, 1087 insertions(+), 235 deletions(-) create mode 100644 muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/ProductCategory.java create mode 100644 muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupStateReq.java create mode 100644 muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoUpdReq.java create mode 100644 muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/WyzRuleInfoSaveReq.java create mode 100644 muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/AttributeGroupUpd.java create mode 100644 muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/CategoryInfoUpdResp.java create mode 100644 muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/ProductCategoryResp.java create mode 100644 muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/ProjectInfoListResp.java diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java index 1ccaec4..0edf18f 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java @@ -11,7 +11,6 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import java.math.BigDecimal; import java.util.Date; /** diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoSelectModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoSelectModel.java index 04dbded..e6f1616 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoSelectModel.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoSelectModel.java @@ -3,8 +3,6 @@ package com.muyu.marketing.domain.model; import com.fasterxml.jackson.annotation.JsonFormat; import com.muyu.marketing.domain.ActivityTeamInfo; -import com.muyu.marketing.domain.ActivityTeamProductSkuInfo; -import com.muyu.marketing.domain.resp.TeamProjectSkuInfoResp; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoUpdModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoUpdModel.java index 2824b86..e0f706a 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoUpdModel.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoUpdModel.java @@ -2,18 +2,13 @@ package com.muyu.marketing.domain.model; import com.fasterxml.jackson.annotation.JsonFormat; -import com.muyu.marketing.domain.ActivityTeamProductSkuInfo; import com.muyu.marketing.domain.req.ActivityTeamProductSkuInfoUpdReq; -import com.muyu.marketing.domain.req.ActivityTeamProductUpdCheckReq; -import com.muyu.marketing.domain.req.TeamProjectSkuInfoAddReq; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import java.util.Date; -import java.util.List; -import java.util.function.Supplier; /** * 团购活动修改模型 diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuModel.java index cc35353..74198bb 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuModel.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuModel.java @@ -1,7 +1,6 @@ package com.muyu.marketing.domain.model; import com.muyu.marketing.domain.ActivityTeamProductSkuInfo; -import com.muyu.marketing.domain.resp.ProjectFindSkuInfoResp; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuSettingModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuSettingModel.java index da8fff3..2b45f1c 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuSettingModel.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuSettingModel.java @@ -1,14 +1,12 @@ package com.muyu.marketing.domain.model; -import com.muyu.marketing.domain.req.ActivityTeamProductSkuSettingReq; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import java.util.List; -import java.util.function.Supplier; /** * 团购商品规格一键设置 diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuUpdModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuUpdModel.java index 5d1ed25..f9b083e 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuUpdModel.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuUpdModel.java @@ -8,7 +8,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.math.BigDecimal; -import java.util.List; /** * 拼团活动商品SKU修改模型 diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductUpdCheckModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductUpdCheckModel.java index 648fa0c..43adad3 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductUpdCheckModel.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductUpdCheckModel.java @@ -1,14 +1,12 @@ package com.muyu.marketing.domain.model; -import com.muyu.marketing.domain.ActivityTeamInfo; import com.muyu.marketing.domain.req.ActivityTeamProductUpdCheckReq; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.math.BigDecimal; import java.util.List; /** diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamProductSkuInfoUpdReq.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamProductSkuInfoUpdReq.java index 1ead292..077865c 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamProductSkuInfoUpdReq.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamProductSkuInfoUpdReq.java @@ -1,16 +1,12 @@ package com.muyu.marketing.domain.req; import com.fasterxml.jackson.annotation.JsonFormat; -import com.muyu.marketing.domain.ActivityTeamProductSkuInfo; -import com.muyu.marketing.domain.model.ActivityTeamProductSkuAddModel; -import com.muyu.marketing.domain.model.ActivityTeamProductSkuUpdModel; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; import java.util.Date; -import java.util.List; /** * 活动商品规格修改入参 diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamProductSkuSettingReq.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamProductSkuSettingReq.java index aa2f8f0..56d635d 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamProductSkuSettingReq.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamProductSkuSettingReq.java @@ -1,7 +1,6 @@ package com.muyu.marketing.domain.req; -import com.muyu.marketing.domain.model.ActivityTeamProductSkuAddModel; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ProjectFindSkuInfoResp.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ProjectFindSkuInfoResp.java index 7a88eaa..eb5b3d2 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ProjectFindSkuInfoResp.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ProjectFindSkuInfoResp.java @@ -1,7 +1,5 @@ package com.muyu.marketing.domain.resp; -import com.muyu.marketing.domain.ActivityTeamProductSkuInfo; -import com.muyu.marketing.domain.model.ActivityTeamProductSkuAddModel; import com.muyu.marketing.domain.model.ActivityTeamProductSkuModel; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java index 5752469..c549ffc 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java @@ -16,6 +16,7 @@ import com.muyu.marketing.domain.resp.TeamInfoListResp; import com.muyu.marketing.team.service.ActivityTeamInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; + import java.util.List; diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/ActivityTeamProductSkuInfoMapper.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/ActivityTeamProductSkuInfoMapper.java index d83106e..2db9ff9 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/ActivityTeamProductSkuInfoMapper.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/ActivityTeamProductSkuInfoMapper.java @@ -1,11 +1,10 @@ package com.muyu.marketing.team.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.marketing.domain.ActivityTeamOpenInfo; import com.muyu.marketing.domain.ActivityTeamProductSkuInfo; import org.apache.ibatis.annotations.Mapper; @Mapper public interface ActivityTeamProductSkuInfoMapper extends BaseMapper { - + } diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/TeamStrategyExemptionMapper.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/TeamStrategyExemptionMapper.java index 66993b5..a96727b 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/TeamStrategyExemptionMapper.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/TeamStrategyExemptionMapper.java @@ -1,11 +1,10 @@ package com.muyu.marketing.team.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.marketing.domain.ActivityTeamProductSkuInfo; import com.muyu.marketing.domain.TeamStrategyExemption; import org.apache.ibatis.annotations.Mapper; @Mapper public interface TeamStrategyExemptionMapper extends BaseMapper { - + } diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java index df40981..f01f2d1 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.marketing.domain.ActivityTeamInfo; import com.muyu.marketing.domain.model.*; -import com.muyu.marketing.domain.req.ActivityTeamProductSkuInfoUpdReq; import com.muyu.marketing.domain.req.TeamInfoListReq; import com.muyu.marketing.domain.resp.ActivityTeamInfoResp; diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamOpenInfoService.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamOpenInfoService.java index dcd70eb..307caa8 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamOpenInfoService.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamOpenInfoService.java @@ -3,7 +3,6 @@ package com.muyu.marketing.team.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.common.core.enums.market.team.TeamOpenTypeEnum; import com.muyu.marketing.domain.ActivityTeamOpenInfo; -import com.muyu.marketing.domain.ActivityTeamProductSkuInfo; public interface ActivityTeamOpenInfoService extends IService { diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java index b80ac57..1898cac 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java @@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.marketing.domain.ActivityTeamInfo; -import com.muyu.marketing.domain.ActivityTeamOpenInfo; -import com.muyu.marketing.domain.ActivityTeamProductSkuInfo; import com.muyu.marketing.domain.model.*; import com.muyu.marketing.domain.req.TeamInfoListReq; import com.muyu.marketing.domain.resp.ActivityTeamInfoResp; diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamProductSkuInfoServiceImpl.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamProductSkuInfoServiceImpl.java index 5af4940..f902197 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamProductSkuInfoServiceImpl.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamProductSkuInfoServiceImpl.java @@ -13,10 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.ArrayList; -import java.util.Comparator; import java.util.List; import java.util.Optional; diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/ProductCategory.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/ProductCategory.java new file mode 100644 index 0000000..9e4e4e8 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/ProductCategory.java @@ -0,0 +1,56 @@ +package com.muyu.product.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +@Data +@NoArgsConstructor +@SuperBuilder +@AllArgsConstructor +@TableName("mall_product_category") +public class ProductCategory { + /** + * 主键自增 + */ + @TableId(type = IdType.AUTO) + private Integer id; + /** + * 名称 + */ + private String name; + /** + * 父级id + */ + private Integer parentId; + /** + * 排序 + */ + private Integer sort; + /** + * 等级 + */ + private String level; + /** + * 类型 + */ + private String type; + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private Date createTime; + /** + * 修改时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private Date updateTime; + +} diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/TemplateAttributeModel.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/TemplateAttributeModel.java index ebd44da..6d1530d 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/TemplateAttributeModel.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/TemplateAttributeModel.java @@ -34,6 +34,8 @@ public class TemplateAttributeModel extends BaseEntity { * 编码 */ private String code; + private String value; + public static TemplateAttributeModel attributeInfoBuild(AttributeInfo attributeInfo){ return TemplateAttributeModel.builder() 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 35a1b47..81195bd 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 @@ -1,7 +1,10 @@ package com.muyu.product.domain.req; import java.util.Date; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.product.domain.AttributeInfo; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; @@ -33,5 +36,9 @@ public class AttributeGroupEditReq extends BaseEntity { @ApiModelProperty(name = "状态", value = "状态", required = true) private String states; + /** 属性id 集合 */ + @ApiModelProperty(name = "属性集合", value = "属性集合", required = true) + private List attributeList; + private List attributeIdList; } diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupStateReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupStateReq.java new file mode 100644 index 0000000..23e5ab4 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupStateReq.java @@ -0,0 +1,24 @@ +package com.muyu.product.domain.req; + +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 修改 属性状态 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class AttributeGroupStateReq { + + /** 属性id */ + @ApiModelProperty(name = "属性id", value = "属性id", required = true) + private Long id; + /** 状态 */ + @ApiModelProperty(name = "状态", value = "状态", required = true) + private String states; +} 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 023446a..29080fc 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 @@ -8,6 +8,8 @@ import lombok.experimental.SuperBuilder; import io.swagger.annotations.*; import com.muyu.common.core.web.domain.TreeEntity; +import java.util.List; + /** * 品类信息对象 category_info * @@ -39,4 +41,21 @@ public class CategoryInfoEditReq extends TreeEntity { @ApiModelProperty(name = "介绍", value = "介绍") private String introduction; + /** + * 商品属性组关联ID + */ + @ApiModelProperty(name = "商品属性组关联ID", value = "商品属性组关联ID") + private List attributeGroupIdList; + /** + * 商品属性关联ID + */ + @ApiModelProperty(name = "商品属性关联ID", value = "商品属性关联ID") + private List attributeIdList; + + /** + * 商品品牌组关联ID + */ + @ApiModelProperty(name = "商品品牌组关联ID", value = "商品品牌组关联ID") + private List brandIdList; + } 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 21f92fb..19ed189 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 @@ -48,7 +48,6 @@ public class CategoryInfoSaveReq extends TreeEntity { private String start; /** 介绍 */ - @ApiModelProperty(name = "介绍", value = "介绍") private String introduction; @@ -56,6 +55,7 @@ public class CategoryInfoSaveReq extends TreeEntity { * 商品属性组关联ID */ private List attributeGroupIdList; + /** * 商品属性关联ID */ 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 4711de1..55bbea6 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 @@ -1,12 +1,13 @@ package com.muyu.product.domain.req; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.AllArgsConstructor; -import lombok.experimental.SuperBuilder; -import io.swagger.annotations.*; import com.muyu.common.core.web.domain.BaseEntity; +import com.muyu.product.domain.ProjectInfo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; /** * 商品信息对象 project_info @@ -63,4 +64,18 @@ public class ProjectInfoEditReq extends BaseEntity { @ApiModelProperty(name = "品牌", value = "品牌") private Long brandId; + + public static ProjectInfoEditReq convertToReq(ProjectInfoUpdReq projectInfoUpdReq){ + ProjectInfo projectInfo = projectInfoUpdReq.getProjectInfo(); + return ProjectInfoEditReq.builder() + .name(projectInfo.getName()) + .introduction(projectInfo.getIntroduction()) + .mianType(projectInfo.getMianType()) + .parentType(projectInfo.getParentType()) + .type(projectInfo.getType()) + .image(projectInfo.getImage()) + .build(); + } + + } diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoUpdReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoUpdReq.java new file mode 100644 index 0000000..8e73bd0 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoUpdReq.java @@ -0,0 +1,37 @@ +package com.muyu.product.domain.req; + +import com.muyu.product.domain.ProjectInfo; +import com.muyu.product.domain.ProjectSkuInfo; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.List; + +/** + * 修改商品 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class ProjectInfoUpdReq { + + /** + * + */ + private List attrValueList; + + /** + * 商品 规格 + */ + private ProjectSkuInfo productSkuList; + /** + * 商品信息 + */ + private ProjectInfo projectInfo; + + + +} diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/WyzRuleInfoSaveReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/WyzRuleInfoSaveReq.java new file mode 100644 index 0000000..a2b9890 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/WyzRuleInfoSaveReq.java @@ -0,0 +1,15 @@ +package com.muyu.product.domain.req; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class WyzRuleInfoSaveReq { + public Long id; + public String status; +} diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/AttributeGroupUpd.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/AttributeGroupUpd.java new file mode 100644 index 0000000..f6781f7 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/AttributeGroupUpd.java @@ -0,0 +1,31 @@ +package com.muyu.product.domain.resp; + +import com.muyu.product.domain.AttributeInfo; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class AttributeGroupUpd { + /** 属性组编号 */ + private Long id; + + /** 组名称 */ + private String name; + + /** 状态 */ + private String states; + + /** + * 属性id 集合 + */ + + private List attributeList; + +} diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/CategoryInfoUpdResp.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/CategoryInfoUpdResp.java new file mode 100644 index 0000000..b6642a5 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/CategoryInfoUpdResp.java @@ -0,0 +1,63 @@ +package com.muyu.product.domain.resp; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.muyu.common.core.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@AllArgsConstructor +@Builder +@NoArgsConstructor +@Data +/** 品类信息*/ +public class CategoryInfoUpdResp { + /** 主键 */ + @TableId(value = "id",type = IdType.AUTO) + @ApiModelProperty(name = "主键", value = "主键") + private Long id; + + /** 品类名称 */ + @Excel(name = "品类名称") + @ApiModelProperty(name = "品类名称", value = "品类名称", required = true) + private String name; + + /** 图片 */ + @Excel(name = "图片") + @ApiModelProperty(name = "图片", value = "图片", required = true) + private String image; + + /** 是否启用 */ + @Excel(name = "是否启用") + @ApiModelProperty(name = "是否启用", value = "是否启用", required = true) + private String start; + + /** 介绍 */ + @Excel(name = "介绍") + @ApiModelProperty(name = "介绍", value = "介绍") + private String introduction; + + /** + * 商品属性 组 关联ID + * AttributeGroup + */ + /** + * 属性集合 + */ + private List attributeInfoList; + + /** + * 属性组集合 + */ + private List attributeGroupList; + + /** + * 品牌集合 + */ + private List brandInfoList; +} diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/ProductCategoryResp.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/ProductCategoryResp.java new file mode 100644 index 0000000..0b44970 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/ProductCategoryResp.java @@ -0,0 +1,35 @@ +package com.muyu.product.domain.resp; + +import com.muyu.product.domain.ProductCategory; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.List; + +/** + * 产品品类 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class ProductCategoryResp extends ProductCategory { + /** + * 产品品类子集合 + */ + private List childrenList; + + public static ProductCategoryResp convertToResp(ProductCategory productCategory){ + return ProductCategoryResp.builder() + .id(productCategory.getId()) + .name(productCategory.getName()) + .level(productCategory.getLevel()) + .parentId(productCategory.getParentId()) + .sort(productCategory.getSort()) + .createTime(productCategory.getCreateTime()) + .updateTime(productCategory.getUpdateTime()) + .build(); + } +} diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/ProjectInfoListResp.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/ProjectInfoListResp.java new file mode 100644 index 0000000..6a2b29d --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/ProjectInfoListResp.java @@ -0,0 +1,129 @@ +package com.muyu.product.domain.resp; + +import com.muyu.common.core.web.domain.BaseEntity; +import com.muyu.product.domain.model.ProjectAddModel; +import com.muyu.product.domain.req.ProjectInfoEditReq; +import com.muyu.product.domain.req.ProjectInfoQueryReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; +import java.util.function.Supplier; + +/** + * 商品信息对象 project_info + * + * @author DongZeLiang + * @date 2024-02-27 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class ProjectInfoListResp extends BaseEntity { + /** 主键 */ + private Long id; + + /** 商品名称 */ + private String name; + + /** 商品描述 */ + private String introduction; + + + /** 主类型 */ + private Long mianType; + + /** + * 主类型名称 + */ + public String mianTypeName; + /** 父类型 */ + private Long parentType; + + private String parentTypeName; + /** 商品类型 */ + private Long type; + + private String typeName; + /** 商品图片 */ + private String image; + + /** 商品轮播图 */ + private String carouselImages; + + /** 商品状态 */ + private String status; + + /** 规格 */ + private Long ruleId; + private String ruleName; + + /** 品牌 */ + private Long brandId; + private String brandName; + + + + + + /** + * 查询构造器 + */ + public static ProjectInfoListResp queryBuild(ProjectInfoQueryReq projectInfoQueryReq){ + return ProjectInfoListResp.builder() + .name(projectInfoQueryReq.getName()) + .introduction(projectInfoQueryReq.getIntroduction()) + .mianType(projectInfoQueryReq.getMianType()) + .parentType(projectInfoQueryReq.getParentType()) + .type(projectInfoQueryReq.getType()) + .image(projectInfoQueryReq.getImage()) + .carouselImages(projectInfoQueryReq.getCarouselImages()) + .status(projectInfoQueryReq.getStatus()) + .ruleId(projectInfoQueryReq.getRuleId()) + .brandId(projectInfoQueryReq.getBrandId()) + .build(); + } + + /** + * 添加构造器 + */ + public static ProjectInfoListResp saveModelBuild(ProjectAddModel projectAddModel, Supplier createBy){ + return ProjectInfoListResp.builder() + .name(projectAddModel.getName()) + .introduction(projectAddModel.getIntroduction()) + .mianType(projectAddModel.getMianType()) + .parentType(projectAddModel.getParentType()) + .type(projectAddModel.getType()) + .image(projectAddModel.getImage()) + .carouselImages(projectAddModel.getCarouselImages()) + .status(projectAddModel.getStatus()) + .ruleId(projectAddModel.getRuleId()) + .brandId(projectAddModel.getBrandId()) + .createBy(createBy.get()) + .createTime(new Date()) + .build(); + } + + /** + * 修改构造器 + */ + public static ProjectInfoListResp editBuild(Long id, ProjectInfoEditReq projectInfoEditReq){ + return ProjectInfoListResp.builder() + .id(id) + .name(projectInfoEditReq.getName()) + .introduction(projectInfoEditReq.getIntroduction()) + .mianType(projectInfoEditReq.getMianType()) + .parentType(projectInfoEditReq.getParentType()) + .type(projectInfoEditReq.getType()) + .image(projectInfoEditReq.getImage()) + .carouselImages(projectInfoEditReq.getCarouselImages()) + .status(projectInfoEditReq.getStatus()) + .ruleId(projectInfoEditReq.getRuleId()) + .brandId(projectInfoEditReq.getBrandId()) + .build(); + } + +} 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 71e0b2b..4c039b9 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 @@ -1,33 +1,29 @@ package com.muyu.product.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import com.muyu.product.domain.model.AttributeGroupSaveModel; -import com.muyu.product.domain.resp.AttributeGroupPageResp; -import com.muyu.product.domain.resp.AttributeGroupUpdResp; -import io.swagger.annotations.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.product.domain.AttributeGroup; +import com.muyu.product.domain.model.AttributeGroupSaveModel; +import com.muyu.product.domain.req.AttributeGroupEditReq; import com.muyu.product.domain.req.AttributeGroupQueryReq; import com.muyu.product.domain.req.AttributeGroupSaveReq; -import com.muyu.product.domain.req.AttributeGroupEditReq; +import com.muyu.product.domain.req.AttributeGroupStateReq; +import com.muyu.product.domain.resp.AttributeGroupPageResp; +import com.muyu.product.domain.resp.AttributeGroupUpdResp; import com.muyu.product.service.AttributeGroupService; -import com.muyu.common.core.web.page.TableDataInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 属性组Controller @@ -103,6 +99,18 @@ public class AttributeGroupController extends BaseController { return toAjax(attributeGroupService.updateById(AttributeGroup.editBuild(id,attributeGroupEditReq))); } + /*** + * 修改属性 状态 + */ + @RequiresPermissions("product:attributeGroup:edit") + @Log(title = "属性状态", businessType = BusinessType.UPDATE) + @PutMapping("/updateState") + @ApiOperation("修改属性状态") + public Result updateState(@RequestBody AttributeGroupStateReq attributeGroupStateReq) { + attributeGroupService.updateState(attributeGroupStateReq); + return Result.success("修改成功"); + } + /** * 删除属性组 */ 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 4b09002..0073920 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 @@ -1,30 +1,25 @@ package com.muyu.product.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import io.swagger.annotations.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.product.domain.AttributeInfo; +import com.muyu.product.domain.req.AttributeInfoEditReq; import com.muyu.product.domain.req.AttributeInfoQueryReq; import com.muyu.product.domain.req.AttributeInfoSaveReq; -import com.muyu.product.domain.req.AttributeInfoEditReq; import com.muyu.product.service.AttributeInfoService; -import com.muyu.common.core.web.page.TableDataInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 商品属性Controller 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 29d4305..3c770c1 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 @@ -1,31 +1,25 @@ package com.muyu.product.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import com.muyu.common.core.text.Convert; -import io.swagger.annotations.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.muyu.common.core.domain.Result; +import com.muyu.common.core.text.Convert; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.product.domain.BrandInfo; +import com.muyu.product.domain.req.BrandInfoEditReq; import com.muyu.product.domain.req.BrandInfoQueryReq; import com.muyu.product.domain.req.BrandInfoSaveReq; -import com.muyu.product.domain.req.BrandInfoEditReq; import com.muyu.product.service.BrandInfoService; -import com.muyu.common.core.web.page.TableDataInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 品牌信息Controller 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 55dbaef..6e857ef 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,37 +1,27 @@ 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; -import com.muyu.product.domain.AttributeGroup; -import com.muyu.product.domain.AttributeInfo; -import com.muyu.product.domain.BrandInfo; -import com.muyu.product.domain.model.CategoryInfoSaveModel; -import com.muyu.product.domain.resp.CategoryCommonElementResp; -import com.muyu.product.domain.resp.CategoryParentCommonElementResp; -import io.swagger.annotations.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; +import com.muyu.common.security.utils.SecurityUtils; import com.muyu.product.domain.CategoryInfo; -import com.muyu.product.domain.req.CategoryInfoQueryReq; -import com.muyu.product.domain.req.CategoryInfoSaveReq; +import com.muyu.product.domain.model.CategoryInfoSaveModel; import com.muyu.product.domain.req.CategoryInfoEditReq; +import com.muyu.product.domain.req.CategoryInfoSaveReq; +import com.muyu.product.domain.resp.CategoryCommonElementResp; +import com.muyu.product.domain.resp.CategoryParentCommonElementResp; import com.muyu.product.service.CategoryInfoService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 品类信息Controller @@ -136,9 +126,7 @@ 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( - @PathVariable(value = "categoryId") Long categoryId - ) { + public Result parentCommonElement(@PathVariable(value = "categoryId") Long 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 2f33085..7aa33c1 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 @@ -1,30 +1,25 @@ package com.muyu.product.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import io.swagger.annotations.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.product.domain.CommentInfo; +import com.muyu.product.domain.req.CommentInfoEditReq; import com.muyu.product.domain.req.CommentInfoQueryReq; import com.muyu.product.domain.req.CommentInfoSaveReq; -import com.muyu.product.domain.req.CommentInfoEditReq; import com.muyu.product.service.CommentInfoService; -import com.muyu.common.core.web.page.TableDataInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 商品评论Controller 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..816d618 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 @@ -1,30 +1,25 @@ package com.muyu.product.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import io.swagger.annotations.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.product.domain.CommentLikeInfo; +import com.muyu.product.domain.req.CommentLikeInfoEditReq; import com.muyu.product.domain.req.CommentLikeInfoQueryReq; import com.muyu.product.domain.req.CommentLikeInfoSaveReq; -import com.muyu.product.domain.req.CommentLikeInfoEditReq; import com.muyu.product.service.CommentLikeInfoService; -import com.muyu.common.core.web.page.TableDataInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 评论点赞Controller 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 87fcad1..ead5459 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 @@ -1,32 +1,29 @@ package com.muyu.product.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import com.muyu.product.cache.ProjectInfoCache; -import com.muyu.product.domain.resp.ProjectDetailResp; -import io.swagger.annotations.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; +import com.muyu.product.cache.ProjectInfoCache; import com.muyu.product.domain.ProjectInfo; +import com.muyu.product.domain.req.ProjectInfoEditReq; import com.muyu.product.domain.req.ProjectInfoQueryReq; import com.muyu.product.domain.req.ProjectInfoSaveReq; -import com.muyu.product.domain.req.ProjectInfoEditReq; +import com.muyu.product.domain.req.ProjectInfoUpdReq; +import com.muyu.product.domain.resp.ProjectDetailResp; +import com.muyu.product.domain.resp.ProjectInfoListResp; import com.muyu.product.service.ProjectInfoService; -import com.muyu.common.core.web.page.TableDataInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 商品信息Controller @@ -50,10 +47,10 @@ public class ProjectInfoController extends BaseController { @ApiOperation("获取商品信息列表") @RequiresPermissions("product:info:list") @GetMapping("/list") - public Result> list(ProjectInfoQueryReq projectInfoQueryReq) { + public Result> list(ProjectInfoQueryReq projectInfoQueryReq) { startPage(); - List list = projectInfoService.list(ProjectInfo.queryBuild(projectInfoQueryReq)); - return getDataTable(list); + List projectInfoListResps = projectInfoService.ProjectInfo(ProjectInfo.queryBuild(projectInfoQueryReq)); + return getDataTable(projectInfoListResps); } /** @@ -119,7 +116,8 @@ public class ProjectInfoController extends BaseController { @Log(title = "商品信息", businessType = BusinessType.UPDATE) @PutMapping("/{id}") @ApiOperation("修改商品信息") - public Result edit(@PathVariable Long id, @RequestBody ProjectInfoEditReq projectInfoEditReq) { + public Result edit(@PathVariable Long id, @RequestBody ProjectInfoUpdReq projectInfoUpdReq) { + ProjectInfoEditReq projectInfoEditReq = ProjectInfoEditReq.convertToReq(projectInfoUpdReq); return toAjax(projectInfoService.updateById(ProjectInfo.editBuild(id,projectInfoEditReq))); } 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 772ff23..05e734e 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 @@ -1,30 +1,25 @@ package com.muyu.product.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import io.swagger.annotations.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.product.domain.ProjectSkuInfo; +import com.muyu.product.domain.req.ProjectSkuInfoEditReq; import com.muyu.product.domain.req.ProjectSkuInfoQueryReq; import com.muyu.product.domain.req.ProjectSkuInfoSaveReq; -import com.muyu.product.domain.req.ProjectSkuInfoEditReq; import com.muyu.product.service.ProjectSkuInfoService; -import com.muyu.common.core.web.page.TableDataInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 商品SKUController 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 f7ccd2d..55b03f5 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 @@ -1,30 +1,25 @@ package com.muyu.product.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import io.swagger.annotations.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.product.domain.RuleAttrInfo; +import com.muyu.product.domain.req.RuleAttrInfoEditReq; import com.muyu.product.domain.req.RuleAttrInfoQueryReq; import com.muyu.product.domain.req.RuleAttrInfoSaveReq; -import com.muyu.product.domain.req.RuleAttrInfoEditReq; import com.muyu.product.service.RuleAttrInfoService; -import com.muyu.common.core.web.page.TableDataInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 规格详情Controller 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 4eb5843..9399860 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 @@ -1,34 +1,29 @@ package com.muyu.product.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import com.muyu.common.core.text.Convert; -import com.muyu.product.domain.model.RuleInfoAddModel; -import com.muyu.product.domain.resp.RuleInfoResp; -import com.muyu.product.domain.resp.RuleInfoUpdResp; -import io.swagger.annotations.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.muyu.common.core.domain.Result; +import com.muyu.common.core.text.Convert; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.product.domain.RuleInfo; +import com.muyu.product.domain.model.RuleInfoAddModel; +import com.muyu.product.domain.req.RuleInfoEditReq; import com.muyu.product.domain.req.RuleInfoQueryReq; import com.muyu.product.domain.req.RuleInfoSaveReq; -import com.muyu.product.domain.req.RuleInfoEditReq; +import com.muyu.product.domain.resp.RuleInfoResp; +import com.muyu.product.domain.resp.RuleInfoUpdResp; import com.muyu.product.service.RuleInfoService; -import com.muyu.common.core.web.page.TableDataInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 商品规格Controller 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..6b23d5b 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 @@ -1,8 +1,9 @@ package com.muyu.product.mapper; -import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.product.domain.AsAttributeGroup; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 属性与组中间Mapper接口 @@ -10,6 +11,11 @@ import com.muyu.product.domain.AsAttributeGroup; * @author DongZeLiang * @date 2024-02-27 */ +@Mapper public interface AsAttributeGroupMapper extends BaseMapper { + void delete(Long id); + + //添加 属性组 + void add(@Param("groupId") Long groupId, @Param("id") Long id); } 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..ce57a2a 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 @@ -1,6 +1,5 @@ package com.muyu.product.mapper; -import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.product.domain.AsBrandProject; 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..bebea61 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 @@ -1,8 +1,11 @@ package com.muyu.product.mapper; -import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.product.domain.AsCategoryAttributeGroup; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 品类属性组中间Mapper接口 @@ -10,6 +13,20 @@ import com.muyu.product.domain.AsCategoryAttributeGroup; * @author DongZeLiang * @date 2024-02-27 */ +@Mapper public interface AsCategoryAttributeGroupMapper extends BaseMapper { + void deleteAsCategoryAttributeGroup(Long id); + + /** + * 添加 品类 属性组 中间表 + * categoryId:品类id + * attributeGroupId:属性id + */ + void addAsCategoryAttributeGroup(@Param("categoryId") Long categoryId, @Param("attributeGroupId") Long attributeGroupId); + + /** + * 查询 品类 属性组 中间表 + */ + List selectAsCategoryAttributeGroupList(@Param("id") Long id); } 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..1f30262 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 @@ -1,8 +1,11 @@ package com.muyu.product.mapper; -import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.product.domain.AsCategoryAttribute; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 品类属性中间Mapper接口 @@ -10,6 +13,23 @@ import com.muyu.product.domain.AsCategoryAttribute; * @author DongZeLiang * @date 2024-02-27 */ +@Mapper public interface AsCategoryAttributeMapper extends BaseMapper { + + /**删除 品类 属性 中间表 */ + void deleteAsCategoryAttribute(Long id); + + + /** + * 添加 品类 属性 中间表 + * categoryId:品类id + * attributeId:属性id + */ + void addAsCategoryAttribute(@Param("categoryId") Long categoryId, @Param("attributeId") Long attributeId); + + /** + * 查询 品类 属性组 中间表 + */ + List selectAsCategoryAttributeList(@Param("id") Long id); } 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..115458e 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 @@ -1,8 +1,11 @@ package com.muyu.product.mapper; -import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.product.domain.AsCategoryBrand; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 品类品牌中间Mapper接口 @@ -10,6 +13,21 @@ import com.muyu.product.domain.AsCategoryBrand; * @author DongZeLiang * @date 2024-02-27 */ +@Mapper public interface AsCategoryBrandMapper extends BaseMapper { + /**删除 品类 品牌 中间表 */ + void deleteAsCategoryBrandMapper(Long id); + + /** + * 添加 品类 品牌 中间表 + * categoryId:品类id + * brandId:品牌id + */ + void addAsCategoryBrandMapper(@Param("categoryId") Long categoryId, @Param("brandId") Long brandId); + + /** + * 查询 品类 属性组 中间表 + */ + List selectAsCategoryBrandList(@Param("id") Long id); } 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..6ee2f34 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 @@ -1,6 +1,5 @@ package com.muyu.product.mapper; -import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.product.domain.AsProductAttributeInfo; 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..e5d000e 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 @@ -1,8 +1,8 @@ package com.muyu.product.mapper; -import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.product.domain.AttributeGroup; +import org.apache.ibatis.annotations.Mapper; /** * 属性组Mapper接口 @@ -10,6 +10,7 @@ import com.muyu.product.domain.AttributeGroup; * @author DongZeLiang * @date 2024-02-27 */ +@Mapper 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..65fd3d5 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 @@ -1,6 +1,5 @@ package com.muyu.product.mapper; -import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.product.domain.AttributeInfo; 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..650752e 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 @@ -1,6 +1,5 @@ package com.muyu.product.mapper; -import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.product.domain.BrandInfo; 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..0a7d3b5 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 @@ -1,9 +1,10 @@ package com.muyu.product.mapper; -import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.product.domain.CategoryInfo; +import java.util.List; + /** * 品类信息Mapper接口 * @@ -12,4 +13,11 @@ import com.muyu.product.domain.CategoryInfo; */ public interface CategoryInfoMapper extends BaseMapper { + + //修改 品类 + boolean updateCategoryInfo( CategoryInfo categoryInfo ); + + CategoryInfo findByOne(Long ids); + + List findParentId(Long parentId); } 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..871e738 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 @@ -1,6 +1,5 @@ package com.muyu.product.mapper; -import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.product.domain.CommentInfo; 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..21349f8 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 @@ -1,6 +1,5 @@ package com.muyu.product.mapper; -import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.product.domain.CommentLikeInfo; 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..94ddf7e 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 @@ -1,8 +1,8 @@ package com.muyu.product.mapper; -import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.product.domain.ProjectInfo; +import org.apache.ibatis.annotations.Mapper; /** * 商品信息Mapper接口 @@ -10,6 +10,7 @@ import com.muyu.product.domain.ProjectInfo; * @author DongZeLiang * @date 2024-02-27 */ +@Mapper 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..9ae73dc 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 @@ -1,6 +1,5 @@ package com.muyu.product.mapper; -import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.product.domain.ProjectSkuInfo; 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..3cbdd02 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 @@ -1,6 +1,5 @@ package com.muyu.product.mapper; -import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.product.domain.RuleAttrInfo; 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..4339f2b 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 @@ -1,8 +1,8 @@ package com.muyu.product.mapper; -import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.product.domain.RuleInfo; +import org.apache.ibatis.annotations.Mapper; /** * 商品规格Mapper接口 @@ -10,6 +10,7 @@ import com.muyu.product.domain.RuleInfo; * @author DongZeLiang * @date 2024-02-27 */ +@Mapper public interface RuleInfoMapper extends BaseMapper { } 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 5e50f89..405d725 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 @@ -7,7 +7,10 @@ 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.req.AttributeGroupStateReq; import com.muyu.product.domain.resp.AttributeGroupPageResp; +import com.muyu.product.domain.resp.AttributeGroupUpd; import com.muyu.product.domain.resp.AttributeGroupUpdResp; /** @@ -46,4 +49,21 @@ public interface AttributeGroupService extends IService { * @return */ AttributeGroupUpdResp getUpdById(Long id); + + /** + * 吴彦祖 的 修改 属性 + */ + void updateAttribute(Long id, AttributeGroupEditReq attributeGroupEditReq); + /** + * 吴彦祖 的 回显属性组 + * @param id + * @return + */ + AttributeGroupUpd getByIdUpd(Long id); + + /** + * 修改 属性 状态 （wyz） + * @param attributeGroupStateReq + */ + void updateState(AttributeGroupStateReq attributeGroupStateReq); } 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 9b99d9d..e3cda82 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 @@ -8,7 +8,9 @@ import com.muyu.product.domain.BrandInfo; import com.muyu.product.domain.CategoryInfo; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.product.domain.model.CategoryInfoSaveModel; +import com.muyu.product.domain.req.CategoryInfoEditReq; import com.muyu.product.domain.resp.CategoryCommonElementResp; +import com.muyu.product.domain.resp.CategoryInfoUpdResp; import com.muyu.product.domain.resp.CategoryParentCommonElementResp; /** @@ -69,4 +71,17 @@ public interface CategoryInfoService extends IService { CategoryCommonElementResp getTemplateAttributeByCateGoryId (Long cateGoryId); public List getCommon (Long categoryId, IService iService, IService bsiService); + + /** + * 修改品类信息 吴彦祖 + * @param id + * @param categoryInfoEditReq + * @return + */ + + boolean updateUpdById(Long id, CategoryInfoEditReq categoryInfoEditReq); + + + /** 获取品类信息详细信息 wyz*/ + CategoryInfoUpdResp getByIdUpd(Long id); } 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 0924c9e..ae8a90b 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 @@ -1,10 +1,14 @@ package com.muyu.product.service; import java.util.List; + +import com.muyu.common.core.domain.Result; import com.muyu.product.domain.ProjectInfo; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.product.domain.req.ProjectInfoEditReq; import com.muyu.product.domain.req.ProjectInfoSaveReq; import com.muyu.product.domain.resp.ProjectDetailResp; +import com.muyu.product.domain.resp.ProjectInfoListResp; /** * 商品信息Service接口 @@ -20,7 +24,7 @@ public interface ProjectInfoService extends IService { * @return 商品信息集合 */ public List list(ProjectInfo projectInfo); - + public List ProjectInfo(ProjectInfo projectInfo); /** * 保存商品信息 * @param projectInfoSaveReq 请求对象 @@ -34,4 +38,12 @@ public interface ProjectInfoService extends IService { * @return 商品详情 */ ProjectDetailResp getDetailInfo (Long id); + /** + * 吴彦祖 的 自定义 修改方法 + * @param id + * @param projectInfoEditReq + * @return + */ + Result wyzUpdateProjectInfo(Long id, ProjectInfoEditReq projectInfoEditReq); + } 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 2623202..22b57d7 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 @@ -3,6 +3,7 @@ package com.muyu.product.service; import java.util.List; import com.muyu.product.domain.RuleAttrInfo; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.product.domain.req.WyzRuleInfoSaveReq; /** * 规格详情Service接口 @@ -25,4 +26,8 @@ public interface RuleAttrInfoService extends IService { * @return 规格详情集合 */ List getInfoByRuleId (Long ruleId); + /** + * 修改 规格 状态 + */ + void updateSaveById(WyzRuleInfoSaveReq wyzRuleInfoSaveReq); } 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 6c5933d..ec59e4e 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 @@ -49,4 +49,6 @@ public interface RuleInfoService extends IService { * @return */ boolean updateById(Long id, RuleInfoEditReq ruleInfoEditReq); + + } 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 cbb3a6a..c53982a 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 @@ -9,8 +9,12 @@ 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.req.AttributeGroupStateReq; import com.muyu.product.domain.resp.AttributeGroupPageResp; +import com.muyu.product.domain.resp.AttributeGroupUpd; import com.muyu.product.domain.resp.AttributeGroupUpdResp; +import com.muyu.product.mapper.AsAttributeGroupMapper; import com.muyu.product.mapper.AttributeGroupMapper; import com.muyu.product.service.AsAttributeGroupService; import com.muyu.product.service.AttributeGroupService; @@ -38,6 +42,9 @@ public class AttributeGroupServiceImpl extends ServiceImpl list = attributeGroupEditReq.getAttributeIdList(); + //添加 + for (Long info : list) { + attributeGroupMapper.add(id,info); + } + }else { + List list = attributeGroupEditReq.getAttributeList(); + //添加 + for (AttributeInfo info : list) { + attributeGroupMapper.add(id,info.getId()); + } + } + //获取新数据组 + + } + + @Autowired + private AttributeGroupMapper mapper; + + /** + * 吴彦祖 修改 属性 状态 + * @param attributeGroupStateReq + */ + @Override + public void updateState(AttributeGroupStateReq attributeGroupStateReq) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(AttributeGroup ::getId ,attributeGroupStateReq.getId()); + + AttributeGroup attributeGroup = new AttributeGroup(); + attributeGroup.setStates(attributeGroupStateReq.getStates()); + + mapper.update(attributeGroup,queryWrapper); + } + + //属性与组中间列表 + @Autowired + private AsAttributeGroupService attributeGroupService; + + /** + * 吴彦祖 的 回显属性组 + * @param id + * @return + */ + @Override + public AttributeGroupUpd getByIdUpd(Long id) { + //获取当前id的 组 + AttributeGroup byId = this.getById(id); + //查询 该 组 的 属性 集合 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + //返回 + wrapper.eq(AsAttributeGroup::getGroupId,id); + List asAttributeGroups=attributeGroupService.list(wrapper); + //判断当前会显得 属性及 是否为空 + if (asAttributeGroups.size() != 0){ + List longList = asAttributeGroups.stream() + .map(AsAttributeGroup::getAttributeId)//属性 + .toList(); + List attributeInfos = attributeInfoService.listByIds(longList); + return AttributeGroupUpd.builder() + .id(byId.getId()) + .name(byId.getName()) + .attributeList(//属性 + attributeInfos + ).build();//修改回显时信息 + } + + return AttributeGroupUpd.builder() + .id(byId.getId()) + .name(byId.getName()) + .build();//修改回显时信息 + } + } 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 2d6b4d5..2af718f 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 @@ -10,8 +10,13 @@ import com.muyu.product.domain.base.CategoryBase; import com.muyu.product.domain.model.CategoryInfoSaveModel; import com.muyu.product.domain.model.TemplateAttributeGroupModel; 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.CategoryInfoUpdResp; 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; @@ -58,6 +63,18 @@ public class CategoryInfoServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(CategoryInfo::getId,id); + + //修改 品类信息 + CategoryInfo info = CategoryInfo.editBuild(id, categoryInfoEditReq); + if (info != null){ + //修改 品类中 的 商品属性 attributeIdList + updateAttributeIdList(id, categoryInfoEditReq); + //修改 品类中 的 商品属性组 (attributeGroupIdList) + updateAttributeGroupIdList(id, categoryInfoEditReq); + //修改 品类中 的 商品品牌组 brandIdList + updateAsCategoryBrandMapper(id, categoryInfoEditReq); + return true; + } + + return false; + + + } + + /** 获取品类信息详细信息 wyz*/ + @Override + public CategoryInfoUpdResp getByIdUpd(Long id) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(CategoryInfo::getId,id); + CategoryInfo byId = this.getById(id); + //查询 品类信息 + return CategoryInfoUpdResp.builder() + .id(byId.getId()) + .name(byId.getName()) + .image(byId.getImage()) + .start(byId.getStart()) + .introduction(byId.getIntroduction()) + .attributeInfoList(attributeGroupMapper.selectAsCategoryAttributeGroupList(id)) + .attributeGroupList(attributeGroupMapper.selectAsCategoryAttributeGroupList(id)) + .brandInfoList(asCategoryBrandMapper.selectAsCategoryBrandList(id)) + .build(); + } + + + /**修改 品类中 的 商品品牌组 brandIdList**/ + private void updateAsCategoryBrandMapper(Long id, CategoryInfoEditReq categoryInfoEditReq) { + //修改 品类中 的 商品属性 attributeIdList + /** 删除商品品牌组*/ + asCategoryBrandMapper.deleteAsCategoryBrandMapper(id); + //获取 入参中的 商品品牌组 id 集合 + List list = categoryInfoEditReq.getBrandIdList(); + for (Long aLong : list) { + //添加 品类 商品品牌组 中间 表 + asCategoryBrandMapper.addAsCategoryBrandMapper(id,aLong); + } + } + + /**修改 品类中 的 商品属性 attributeIdList**/ + private void updateAttributeIdList(Long id, CategoryInfoEditReq categoryInfoEditReq) { + //修改 品类中 的 商品属性 attributeIdList + /** 删除属性*/ + asCategoryAttributeMapper.deleteAsCategoryAttribute(id); + //获取 入参中的 属性 id 集合 + List list = categoryInfoEditReq.getAttributeIdList(); + for (Long aLong : list) { + //添加 品类 属性 中间 表 + asCategoryAttributeMapper.addAsCategoryAttribute(id,aLong); + } + } + + /**修改 品类中 的 商品属性组 updateAttributeGroupIdList**/ + private void updateAttributeGroupIdList(Long id, CategoryInfoEditReq categoryInfoEditReq) { + /** 删除 属性组*/ + attributeGroupMapper.deleteAsCategoryAttributeGroup(id); + /** 添加 属性组*/ + List list = categoryInfoEditReq.getAttributeGroupIdList(); + for (Long aLong : list) { + attributeGroupMapper.addAsCategoryAttributeGroup(id,aLong); + } + } + + /** * 通过品类ID获取父级以上的属性、属性组、品牌集合 * 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 448a3d9..562f836 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 @@ -2,15 +2,20 @@ package com.muyu.product.service.impl; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedList; import java.util.List; +import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.ObjUtils; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.product.domain.*; import com.muyu.product.domain.model.*; +import com.muyu.product.domain.req.ProjectInfoEditReq; import com.muyu.product.domain.req.ProjectInfoSaveReq; import com.muyu.product.domain.resp.CategoryCommonElementResp; import com.muyu.product.domain.resp.ProjectDetailResp; +import com.muyu.product.domain.resp.ProjectInfoListResp; +import com.muyu.product.mapper.RuleInfoMapper; import com.muyu.product.service.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -101,8 +106,6 @@ public class ProjectInfoServiceImpl extends ServiceImpl wyzUpdateProjectInfo(Long id, ProjectInfoEditReq projectInfoEditReq) { + + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ProjectInfo::getId,id); + + ProjectInfo projectInfo = ProjectInfo.builder() + .id(id) + .name(projectInfoEditReq.getName()) + .introduction(projectInfoEditReq.getIntroduction()) + .mianType(projectInfoEditReq.getMianType()) + .parentType(projectInfoEditReq.getParentType()) + .type(projectInfoEditReq.getType()) + .image(projectInfoEditReq.getImage()) + .carouselImages(projectInfoEditReq.getCarouselImages()) + .status(projectInfoEditReq.getStatus()) + .ruleId(projectInfoEditReq.getRuleId()).build(); + + projectInfoMapper.update(projectInfo,wrapper); + return Result.success("修改成功"); + } + + + @Autowired + private RuleInfoMapper ruleInfoMapper; + @Override + public List ProjectInfo(ProjectInfo projectInfo) { + List list = list(projectInfo); + + List projectInfoListResps = new LinkedList<>(); + list.forEach(p -> { + // 获取类别信息 + CategoryInfo mianTypeName = categoryInfoService.getById(p.getMianType()); + CategoryInfo parentTypeName = categoryInfoService.getById(p.getParentType()); + CategoryInfo typeName = p.getType() != null ? categoryInfoService.getById(p.getType()) : null; + + // 获取规则信息 + RuleInfo ruleName = ruleInfoMapper.selectById(p.getRuleId()); + + // 获取品牌信息 + BrandInfo brandName = brandInfoService.getById(p.getBrandId()); + + // 构建响应对象 + ProjectInfoListResp resp = ProjectInfoListResp.builder() + .id(p.getId()) + .name(p.getName()) + .introduction(p.getIntroduction()) + .mianType(p.getMianType()) + .parentType(p.getParentType()) + .type(p.getType()) + .image(p.getImage()) + .carouselImages(p.getCarouselImages()) + .status(p.getStatus()) + .mianTypeName(mianTypeName != null ? mianTypeName.getName() : "") + .parentTypeName(parentTypeName != null ? parentTypeName.getName() : "") + .typeName(typeName != null ? typeName.getName() : "") + .ruleName(ruleName != null ? ruleName.getName() : "") + .brandName(brandName != null ? brandName.getNam() : "") + .build(); + + // 添加到结果列表 + projectInfoListResps.add(resp); + }); + + return projectInfoListResps; + } + + } 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 4b7b712..c54de0d 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 @@ -3,7 +3,11 @@ package com.muyu.product.service.impl; import java.util.List; import com.muyu.common.core.utils.ObjUtils; +import com.muyu.product.domain.RuleInfo; +import com.muyu.product.domain.req.WyzRuleInfoSaveReq; +import com.muyu.product.mapper.RuleInfoMapper; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.muyu.product.mapper.RuleAttrInfoMapper; import com.muyu.product.domain.RuleAttrInfo; @@ -64,4 +68,21 @@ public class RuleAttrInfoServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(RuleInfo ::getId ,wyzRuleInfoSaveReq.getId()); + + RuleInfo ruleInfo = new RuleInfo(); + ruleInfo.setStatus(wyzRuleInfoSaveReq.getStatus()); + + ruleInfoMapper.update(ruleInfo,queryWrapper); + } } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsAttributeGroupMapper.xml b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsAttributeGroupMapper.xml index 05c468d..f13d5e3 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsAttributeGroupMapper.xml +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsAttributeGroupMapper.xml @@ -18,4 +18,13 @@ select id, group_id, attribute_id, remark, create_by, create_time, update_by, update_time from as_attribute_group + + INSERT INTO `product`.`as_attribute_group` (`id`, `group_id`, `attribute_id`, `remark`, `create_by`, + `create_time`, `update_by`, `update_time`) + VALUES (0,#{groupId}, #{id}, NULL, NULL, NULL, NULL, NULL); + + + + delete from `as_attribute_group` where group_id =#{id} + diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsCategoryAttributeGroupMapper.xml b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsCategoryAttributeGroupMapper.xml index 7196d03..d10c54b 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsCategoryAttributeGroupMapper.xml +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsCategoryAttributeGroupMapper.xml @@ -18,4 +18,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, category_id, attribute_group_id, remark, create_by, create_time, update_by, update_time from as_category_attribute_group + + + delete from `as_category_attribute_group` where category_id=#{id} + + + + + INSERT INTO `as_category_attribute_group` (`id`, `category_id`, `attribute_group_id`, `remark`, + `create_by`, `create_time`, `update_by`, `update_time`) + VALUES (0, #{categoryId}, #{attributeGroupId}, NULL, NULL, NULL, NULL, NULL); + + diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsCategoryAttributeMapper.xml b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsCategoryAttributeMapper.xml index d5544af..ccb6a53 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsCategoryAttributeMapper.xml +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsCategoryAttributeMapper.xml @@ -16,6 +16,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, category_id, attribute_id, remark, create_by, create_time, update_by, update_time from as_category_attribute + select id, + category_id, + attribute_id, + remark, + create_by, + create_time, + update_by, + update_time + from as_category_attribute + + INSERT INTO `as_category_attribute` (`id`, `category_id`, `attribute_id`, `remark`, `create_by`, + `create_time`, `update_by`, `update_time`) + VALUES (0, #{categoryId}, #{attributeId}, NULL, NULL, NULL, NULL, NULL); + + + delete + from `as_category_attribute` + where category_id = #{id} + + + diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsCategoryBrandMapper.xml b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsCategoryBrandMapper.xml index 048317d..a69bd5d 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsCategoryBrandMapper.xml +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsCategoryBrandMapper.xml @@ -18,4 +18,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, category_id, brand_id, remark, create_by, create_time, update_by, update_time from as_category_brand + + INSERT INTO `product`.`as_category_brand` (`id`, `category_id`, `brand_id`, `remark`, `create_by`, + `create_time`, `update_by`, `update_time`) + VALUES (0, #{categoryId}, #{brandId}, NULL, NULL, NULL, NULL, NULL); + + + delete from `as_category_brand` where category_id=#{id} + + + + diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/CategoryInfoMapper.xml b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/CategoryInfoMapper.xml index 99be65b..6a876ef 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/CategoryInfoMapper.xml +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/CategoryInfoMapper.xml @@ -21,4 +21,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, name, image, parent_id, start, introduction, remark, create_by, create_time, update_by, update_time from category_info + + + UPDATE `category_info` + SET `name` = #{name}, + `image` = #{image}, + `parent_id` = #{parentId}, + `start` = #{start}, + `introduction` = #{introduction}, + `remark` = #{remark}, + `create_by` = #{createBy}, + `create_time` = #{createTime}, + `update_by` = #{updateBy}, + `update_time` = #{updateTime} + WHERE `id` = #{id}; + + + + + +