From 7b0ea31558dde0ca33a5e169dbfbba5e2ecfee7a Mon Sep 17 00:00:00 2001 From: Saisai Liu <1374434128@qq.com> Date: Sun, 3 Mar 2024 11:53:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=B1=82=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8C=E5=B1=9E=E6=80=A7=E7=BB=84=E5=89=8D=E5=8F=B0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/vm/java/mapper.java.vm | 27 ++--- .../main/resources/vm/java/service.java.vm | 19 ++-- .../resources/vm/java/serviceImpl.java.vm | 3 +- .../muyu/product/domain/AsAttributeGroup.java | 47 ++------- .../muyu/product/domain/AttributeGroup.java | 72 +++++--------- .../java/com/muyu/product/domain/Brand.java | 15 ++- .../domain/req/AsAttributeGroupReq.java | 70 +++++++++++++ .../product/domain/req/AttributeGroupReq.java | 23 ++++- .../controller/AttributeGroupController.java | 10 +- .../controller/ProductCategoryController.java | 2 +- .../muyu/product/mapper/AddressMapper.java | 6 +- .../mapper/AsAttributeGroupMapper.java | 22 +++-- .../product/mapper/AttributeGroupMapper.java | 20 ++-- .../muyu/product/mapper/AttributeMapper.java | 6 +- .../mapper/AttributeProductMapper.java | 20 ++-- .../product/mapper/BrandCategoryMapper.java | 20 ++-- .../com/muyu/product/mapper/BrandMapper.java | 21 ++-- .../mapper/CategoryAttributeGroupMapper.java | 20 ++-- .../mapper/CategoryAttributeMapper.java | 20 ++-- .../product/mapper/CategoryInfoMapper.java | 20 ++-- .../product/mapper/ProductCategoryMapper.java | 20 ++-- .../product/mapper/ProductInfoMapper.java | 20 ++-- .../com/muyu/product/mapper/RuleMapper.java | 20 ++-- .../product/mapper/RuleProductMapper.java | 20 ++-- .../muyu/product/service/IAddressService.java | 5 +- .../service/IAsAttributeGroupService.java | 18 ++-- .../service/IAttributeGroupService.java | 28 +++--- .../service/IAttributeProductService.java | 19 ++-- .../product/service/IAttributeService.java | 5 +- .../service/IBrandCategoryService.java | 19 ++-- .../muyu/product/service/IBrandService.java | 5 +- .../ICategoryAttributeGroupService.java | 19 ++-- .../service/ICategoryAttributeService.java | 18 ++-- .../product/service/ICategoryInfoService.java | 19 ++-- .../service/IProductCategoryService.java | 19 ++-- .../product/service/IProductInfoService.java | 19 ++-- .../product/service/IRuleProductService.java | 19 ++-- .../muyu/product/service/IRuleService.java | 19 ++-- .../service/impl/AddressServiceImpl.java | 4 +- .../impl/AsAttributeGroupServiceImpl.java | 5 +- .../impl/AttributeGroupServiceImpl.java | 98 ++++++++++++------- .../impl/AttributeProductServiceImpl.java | 4 +- .../service/impl/AttributeServiceImpl.java | 4 +- .../impl/BrandCategoryServiceImpl.java | 4 +- .../service/impl/BrandServiceImpl.java | 5 +- .../CategoryAttributeGroupServiceImpl.java | 7 +- .../impl/CategoryAttributeServiceImpl.java | 6 +- .../service/impl/CategoryInfoServiceImpl.java | 8 +- .../impl/ProductCategoryServiceImpl.java | 4 +- .../service/impl/ProductInfoServiceImpl.java | 4 +- .../service/impl/RuleProductServiceImpl.java | 4 +- .../product/service/impl/RuleServiceImpl.java | 4 +- 52 files changed, 565 insertions(+), 370 deletions(-) create mode 100644 muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AsAttributeGroupReq.java diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/java/mapper.java.vm b/muyu-modules/muyu-gen/src/main/resources/vm/java/mapper.java.vm index 7e7d7c2..4512bad 100644 --- a/muyu-modules/muyu-gen/src/main/resources/vm/java/mapper.java.vm +++ b/muyu-modules/muyu-gen/src/main/resources/vm/java/mapper.java.vm @@ -1,6 +1,7 @@ package ${packageName}.mapper; import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import ${packageName}.domain.${ClassName}; #if($table.sub) import ${packageName}.domain.${subClassName}; @@ -8,15 +9,15 @@ import ${packageName}.domain.${subClassName}; /** * ${functionName}Mapper接口 - * + * * @author ${author} * @date ${datetime} */ -public interface ${ClassName}Mapper +public interface ${ClassName}Mapper extends BaseMapper<${ClassName}> { /** * 查询${functionName} - * + * * @param ${pkColumn.javaField} ${functionName}主键 * @return ${functionName} */ @@ -24,7 +25,7 @@ public interface ${ClassName}Mapper /** * 查询${functionName}列表 - * + * * @param ${className} ${functionName} * @return ${functionName}集合 */ @@ -32,7 +33,7 @@ public interface ${ClassName}Mapper /** * 新增${functionName} - * + * * @param ${className} ${functionName} * @return 结果 */ @@ -40,7 +41,7 @@ public interface ${ClassName}Mapper /** * 修改${functionName} - * + * * @param ${className} ${functionName} * @return 结果 */ @@ -48,7 +49,7 @@ public interface ${ClassName}Mapper /** * 删除${functionName} - * + * * @param ${pkColumn.javaField} ${functionName}主键 * @return 结果 */ @@ -56,7 +57,7 @@ public interface ${ClassName}Mapper /** * 批量删除${functionName} - * + * * @param ${pkColumn.javaField}s 需要删除的数据主键集合 * @return 结果 */ @@ -65,24 +66,24 @@ public interface ${ClassName}Mapper /** * 批量删除${subTable.functionName} - * + * * @param ${pkColumn.javaField}s 需要删除的数据主键集合 * @return 结果 */ public int delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); - + /** * 批量新增${subTable.functionName} - * + * * @param ${subclassName}List ${subTable.functionName}列表 * @return 结果 */ public int batch${subClassName}(List<${subClassName}> ${subclassName}List); - + /** * 通过${functionName}主键删除${subTable.functionName}信息 - * + * * @param ${pkColumn.javaField} ${functionName}ID * @return 结果 */ diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/java/service.java.vm b/muyu-modules/muyu-gen/src/main/resources/vm/java/service.java.vm index 264882b..fbea898 100644 --- a/muyu-modules/muyu-gen/src/main/resources/vm/java/service.java.vm +++ b/muyu-modules/muyu-gen/src/main/resources/vm/java/service.java.vm @@ -1,19 +1,20 @@ package ${packageName}.service; import java.util.List; -import ${packageName}.domain.${ClassName}; +import +import com.baomidou.mybatisplus.extension.service.IService; ${packageName}.domain.${ClassName}; /** * ${functionName}Service接口 - * + * * @author ${author} * @date ${datetime} */ -public interface I${ClassName}Service +public interface ${ClassName}Service extends IService<${ClassName}> { /** * 查询${functionName} - * + * * @param ${pkColumn.javaField} ${functionName}主键 * @return ${functionName} */ @@ -21,7 +22,7 @@ public interface I${ClassName}Service /** * 查询${functionName}列表 - * + * * @param ${className} ${functionName} * @return ${functionName}集合 */ @@ -29,7 +30,7 @@ public interface I${ClassName}Service /** * 新增${functionName} - * + * * @param ${className} ${functionName} * @return 结果 */ @@ -37,7 +38,7 @@ public interface I${ClassName}Service /** * 修改${functionName} - * + * * @param ${className} ${functionName} * @return 结果 */ @@ -45,7 +46,7 @@ public interface I${ClassName}Service /** * 批量删除${functionName} - * + * * @param ${pkColumn.javaField}s 需要删除的${functionName}主键集合 * @return 结果 */ @@ -53,7 +54,7 @@ public interface I${ClassName}Service /** * 删除${functionName}信息 - * + * * @param ${pkColumn.javaField} ${functionName}主键 * @return 结果 */ diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/java/serviceImpl.java.vm b/muyu-modules/muyu-gen/src/main/resources/vm/java/serviceImpl.java.vm index 3904af5..f93d3c5 100644 --- a/muyu-modules/muyu-gen/src/main/resources/vm/java/serviceImpl.java.vm +++ b/muyu-modules/muyu-gen/src/main/resources/vm/java/serviceImpl.java.vm @@ -13,6 +13,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import com.muyu.common.core.utils.StringUtils; import org.springframework.transaction.annotation.Transactional; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import ${packageName}.domain.${subClassName}; #end import ${packageName}.mapper.${ClassName}Mapper; @@ -26,7 +27,7 @@ import ${packageName}.service.I${ClassName}Service; * @date ${datetime} */ @Service -public class ${ClassName}ServiceImpl implements I${ClassName}Service +public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper,${ClassName}> implements ${ClassName}Service { @Autowired private ${ClassName}Mapper ${className}Mapper; diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsAttributeGroup.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsAttributeGroup.java index 3b3feca..89dc7dd 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsAttributeGroup.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsAttributeGroup.java @@ -12,6 +12,8 @@ import lombok.experimental.SuperBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; +import java.util.List; + /** * 属性组中间对象 as_attribute_group * @@ -38,45 +40,10 @@ public class AsAttributeGroup extends BaseEntity @Excel(name = "分组编号") private Long groupId; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setAttributeId(Long attributeId) - { - this.attributeId = attributeId; - } - - public Long getAttributeId() - { - return attributeId; - } - public void setGroupId(Long groupId) - { - this.groupId = groupId; - } - - public Long getGroupId() - { - return groupId; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("attributeId", getAttributeId()) - .append("groupId", getGroupId()) - .append("remark", getRemark()) - .append("createBy", SecurityUtils.getUsername()) - .append("createTime", getCreateTime()) - .append("updateBy", SecurityUtils.getUsername()) - .append("updateTime", getUpdateTime()) - .toString(); + public static AsAttributeGroup saveBuilder(Long id, Long attributeId) { + return AsAttributeGroup.builder() + .groupId(id) + .attributeId(attributeId) + .build(); } } diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeGroup.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeGroup.java index 2126d80..a910a89 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeGroup.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeGroup.java @@ -3,6 +3,7 @@ package com.muyu.product.domain; import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.web.domain.BaseEntity; import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.product.domain.req.AttributeGroupReq; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -36,60 +37,41 @@ public class AttributeGroup extends BaseEntity @Excel(name = "组名") private String name; - private List checkedAttributeIds; + private List attributeList; /** 状态 */ @Excel(name = "状态") private String states; - public void setId(Long id) - { - this.id = id; + //创建添加属性组构建体 + public static AttributeGroup saveBuilder(AttributeGroupReq attributeGroupReq) { + return AttributeGroup.builder() + .name(attributeGroupReq.getName()) + .states(attributeGroupReq.getStates()) + .createBy(SecurityUtils.getUsername()) + .createTime(new Date()) + .build(); } - public Long getId() - { - return id; - } - public void setName(String name) - { - this.name = name; + + //创建修改属性组构建体 + public static AttributeGroup editBuilder(AttributeGroupReq attributeGroupReq) { + return AttributeGroup.builder() + .id(attributeGroupReq.getId()) + .name(attributeGroupReq.getName()) + .states(attributeGroupReq.getStates()) + .updateBy(SecurityUtils.getUsername()) + .updateTime(new Date()) + .build(); } - public String getName() - { - return name; + public static AttributeGroup createBuilder(AttributeGroupReq attributeGroupReq) { + return AttributeGroup.builder() + .name(attributeGroupReq.getName()) + .states(attributeGroupReq.getStates()) + .createTime(new Date()) + .createBy(SecurityUtils.getUsername()) + .build(); } - public void setStates(String states) - { - this.states = states; - } - - public String getStates() - { - return states; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("name", getName()) - .append("states", getStates()) - .append("remark", getRemark()) - .append("createBy", SecurityUtils.getUsername()) - .append("createTime", getCreateTime()) - .append("updateBy", SecurityUtils.getUsername()) - .append("updateTime", getUpdateTime()) - .toString(); - } - -// public static AttributeGroup queryBuilder (AttributeGroupReq attributeGroupReq) { -// return AttributeGroup.builder() -// .createBy(attributeGroupReq) -// .createTime(new Date()) -// .build(). -// } - } diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/Brand.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/Brand.java index c447bab..92270ef 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/Brand.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/Brand.java @@ -132,7 +132,6 @@ public class Brand extends BaseEntity { //添加数据构造体 public static Brand saveBuilder(BrandReq brandReq) { return Brand.builder() - .id(brandReq.getId()) .name(brandReq.getName()) .logo(brandReq.getLogo()) .introduction(brandReq.getIntroduction()) @@ -142,4 +141,18 @@ public class Brand extends BaseEntity { .build(); } + + //修改构建体 + public static Brand updateBuilder(BrandReq brandReq) { + return Brand.builder() + .id(brandReq.getId()) + .name(brandReq.getName()) + .logo(brandReq.getLogo()) + .introduction(brandReq.getIntroduction()) + .status(brandReq.getStatus()) + .updateBy(SecurityUtils.getUsername()) + .updateTime(new Date()) + .build(); + } + } diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AsAttributeGroupReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AsAttributeGroupReq.java new file mode 100644 index 0000000..f1dfd77 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AsAttributeGroupReq.java @@ -0,0 +1,70 @@ +package com.muyu.product.domain.req; + +import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.web.domain.BaseEntity; +import com.muyu.common.security.utils.SecurityUtils; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.Date; +import java.util.List; + +/** + * 属性组中间对象 as_attribute_group + * + * @author Saisai + * @date 2024-02-29 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class AsAttributeGroupReq extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + + /** 属性编号 */ + @Excel(name = "属性编号") + private Long attributeId; + + /** + * 属性id集合 + */ + private List attributeIds; + + /** 分组编号 */ + @Excel(name = "分组编号") + private Long groupId; + + //添加组内属性构造体 + public static AsAttributeGroupReq saveBuilder(AttributeGroupReq attributeGroupReq){ + return AsAttributeGroupReq.builder() + .attributeIds(attributeGroupReq.getCheckedAttributeIds()) + .groupId(attributeGroupReq.getId()) + .createBy(SecurityUtils.getUsername()) + .createTime(new Date()) + .build(); + } + + //修改组内属性构造体 + public static AsAttributeGroupReq updateBuilder(AttributeGroupReq attributeGroupReq){ + return AsAttributeGroupReq.builder() + .attributeIds(attributeGroupReq.getCheckedAttributeIds()) + .groupId(attributeGroupReq.getId()) + .createBy(SecurityUtils.getUsername()) + .createTime(new Date()) + .build(); + } + + +} diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupReq.java index 37bb5c9..6a9cfe9 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupReq.java @@ -3,6 +3,7 @@ package com.muyu.product.domain.req; import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.web.domain.BaseEntity; import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.product.domain.AttributeGroup; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,6 +12,7 @@ import lombok.experimental.SuperBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; +import java.util.Date; import java.util.List; /** @@ -42,7 +44,24 @@ public class AttributeGroupReq extends BaseEntity private String states; + //添加构建体 + public static AttributeGroup saveBuilder(AttributeGroupReq attributeGroupReq) { + return AttributeGroup.builder() + .name(attributeGroupReq.getName()) + .states(attributeGroupReq.getStates()) + .createBy(SecurityUtils.getUsername()) + .createTime(new Date()) + .build(); + } - - + //修改构建体 + public static AttributeGroup updateBuilder(AttributeGroupReq attributeGroupReq) { + return AttributeGroup.builder() + .id(attributeGroupReq.getId()) + .name(attributeGroupReq.getName()) + .states(attributeGroupReq.getStates()) + .updateBy(SecurityUtils.getUsername()) + .updateTime(new Date()) + .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 b7f549c..3f3b712 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeGroupController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeGroupController.java @@ -3,6 +3,8 @@ package com.muyu.product.controller; import java.util.List; import java.io.IOException; import javax.servlet.http.HttpServletResponse; + +import com.muyu.product.domain.req.AttributeGroupReq; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -76,9 +78,9 @@ public class AttributeGroupController extends BaseController @RequiresPermissions("product:group:add") @Log(title = "属性组", businessType = BusinessType.INSERT) @PostMapping - public Result add(@RequestBody AttributeGroup attributeGroup) + public Result add(@RequestBody AttributeGroupReq attributeGroupReq) { - return toAjax(attributeGroupService.insertAttributeGroup(attributeGroup)); + return toAjax(attributeGroupService.insertAttributeGroup(attributeGroupReq)); } /** @@ -87,9 +89,9 @@ public class AttributeGroupController extends BaseController @RequiresPermissions("product:group:edit") @Log(title = "属性组", businessType = BusinessType.UPDATE) @PutMapping - public Result edit(@RequestBody AttributeGroup attributeGroup) + public Result edit(@RequestBody AttributeGroupReq attributeGroupReq) { - return toAjax(attributeGroupService.updateAttributeGroup(attributeGroup)); + return toAjax(attributeGroupService.updateAttributeGroup(attributeGroupReq)); } /** diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProductCategoryController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProductCategoryController.java index 017e1ef..36edca9 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProductCategoryController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProductCategoryController.java @@ -30,7 +30,7 @@ import com.muyu.common.core.web.page.TableDataInfo; */ @RestController @RequestMapping("/product_category") -public class ProductCategoryController extends BaseController +public class ProductCategoryController extends BaseController { @Autowired private IProductCategoryService productCategoryService; diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AddressMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AddressMapper.java index be9aa57..683a625 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AddressMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AddressMapper.java @@ -1,15 +1,17 @@ package com.muyu.product.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.product.domain.Address; /** - * 地区Mapper接口 + * 地区Mapper extends BaseMapper<>接口 * * @author Saisai * @date 2024-02-29 */ -public interface AddressMapper +public interface AddressMapper extends BaseMapper
{ /** * 查询地区 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 229832b..2c8cb51 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,19 +1,21 @@ package com.muyu.product.mapper; -import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.product.domain.AsAttributeGroup; +import java.util.List; + /** - * 属性组中间Mapper接口 - * + * 属性组中间Mapper extends BaseMapper<>接口 + * * @author Saisai * @date 2024-02-29 */ -public interface AsAttributeGroupMapper +public interface AsAttributeGroupMapper extends BaseMapper { /** * 查询属性组中间 - * + * * @param id 属性组中间主键 * @return 属性组中间 */ @@ -21,7 +23,7 @@ public interface AsAttributeGroupMapper /** * 查询属性组中间列表 - * + * * @param asAttributeGroup 属性组中间 * @return 属性组中间集合 */ @@ -29,7 +31,7 @@ public interface AsAttributeGroupMapper /** * 新增属性组中间 - * + * * @param asAttributeGroup 属性组中间 * @return 结果 */ @@ -37,7 +39,7 @@ public interface AsAttributeGroupMapper /** * 修改属性组中间 - * + * * @param asAttributeGroup 属性组中间 * @return 结果 */ @@ -45,7 +47,7 @@ public interface AsAttributeGroupMapper /** * 删除属性组中间 - * + * * @param id 属性组中间主键 * @return 结果 */ @@ -53,7 +55,7 @@ public interface AsAttributeGroupMapper /** * 批量删除属性组中间 - * + * * @param ids 需要删除的数据主键集合 * @return 结果 */ 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 110cb35..abf14c4 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,19 +1,21 @@ package com.muyu.product.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.product.domain.AttributeGroup; /** - * 属性组Mapper接口 - * + * 属性组Mapper extends BaseMapper<>接口 + * * @author muyu * @date 2024-02-29 */ -public interface AttributeGroupMapper +public interface AttributeGroupMapper extends BaseMapper { /** * 查询属性组 - * + * * @param id 属性组主键 * @return 属性组 */ @@ -21,7 +23,7 @@ public interface AttributeGroupMapper /** * 查询属性组列表 - * + * * @param attributeGroup 属性组 * @return 属性组集合 */ @@ -29,7 +31,7 @@ public interface AttributeGroupMapper /** * 新增属性组 - * + * * @param attributeGroup 属性组 * @return 结果 */ @@ -37,7 +39,7 @@ public interface AttributeGroupMapper /** * 修改属性组 - * + * * @param attributeGroup 属性组 * @return 结果 */ @@ -45,7 +47,7 @@ public interface AttributeGroupMapper /** * 删除属性组 - * + * * @param id 属性组主键 * @return 结果 */ @@ -53,7 +55,7 @@ public interface AttributeGroupMapper /** * 批量删除属性组 - * + * * @param ids 需要删除的数据主键集合 * @return 结果 */ diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeMapper.java index 0fcf195..b19927f 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeMapper.java @@ -1,15 +1,17 @@ package com.muyu.product.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.product.domain.Attribute; /** - * 属性Mapper接口 + * 属性Mapper extends BaseMapper<>接口 * * @author saisai * @date 2024-02-29 */ -public interface AttributeMapper +public interface AttributeMapper extends BaseMapper { /** * 查询属性 diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeProductMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeProductMapper.java index b5956ec..e5cfc47 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeProductMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeProductMapper.java @@ -1,19 +1,21 @@ package com.muyu.product.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.product.domain.AttributeProduct; /** - * 商品属性中间表Mapper接口 - * + * 商品属性中间表Mapper extends BaseMapper<>接口 + * * @author Saisai * @date 2024-02-29 */ -public interface AttributeProductMapper +public interface AttributeProductMapper extends BaseMapper { /** * 查询商品属性中间表 - * + * * @param id 商品属性中间表主键 * @return 商品属性中间表 */ @@ -21,7 +23,7 @@ public interface AttributeProductMapper /** * 查询商品属性中间表列表 - * + * * @param attributeProduct 商品属性中间表 * @return 商品属性中间表集合 */ @@ -29,7 +31,7 @@ public interface AttributeProductMapper /** * 新增商品属性中间表 - * + * * @param attributeProduct 商品属性中间表 * @return 结果 */ @@ -37,7 +39,7 @@ public interface AttributeProductMapper /** * 修改商品属性中间表 - * + * * @param attributeProduct 商品属性中间表 * @return 结果 */ @@ -45,7 +47,7 @@ public interface AttributeProductMapper /** * 删除商品属性中间表 - * + * * @param id 商品属性中间表主键 * @return 结果 */ @@ -53,7 +55,7 @@ public interface AttributeProductMapper /** * 批量删除商品属性中间表 - * + * * @param ids 需要删除的数据主键集合 * @return 结果 */ diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/BrandCategoryMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/BrandCategoryMapper.java index 240f700..8efff48 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/BrandCategoryMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/BrandCategoryMapper.java @@ -1,19 +1,21 @@ package com.muyu.product.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.product.domain.BrandCategory; /** - * 品牌品类中间Mapper接口 - * + * 品牌品类中间Mapper extends BaseMapper<>接口 + * * @author Saisai * @date 2024-02-29 */ -public interface BrandCategoryMapper +public interface BrandCategoryMapper extends BaseMapper { /** * 查询品牌品类中间 - * + * * @param id 品牌品类中间主键 * @return 品牌品类中间 */ @@ -21,7 +23,7 @@ public interface BrandCategoryMapper /** * 查询品牌品类中间列表 - * + * * @param brandCategory 品牌品类中间 * @return 品牌品类中间集合 */ @@ -29,7 +31,7 @@ public interface BrandCategoryMapper /** * 新增品牌品类中间 - * + * * @param brandCategory 品牌品类中间 * @return 结果 */ @@ -37,7 +39,7 @@ public interface BrandCategoryMapper /** * 修改品牌品类中间 - * + * * @param brandCategory 品牌品类中间 * @return 结果 */ @@ -45,7 +47,7 @@ public interface BrandCategoryMapper /** * 删除品牌品类中间 - * + * * @param id 品牌品类中间主键 * @return 结果 */ @@ -53,7 +55,7 @@ public interface BrandCategoryMapper /** * 批量删除品牌品类中间 - * + * * @param ids 需要删除的数据主键集合 * @return 结果 */ diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/BrandMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/BrandMapper.java index 982884e..5cdd87e 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/BrandMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/BrandMapper.java @@ -1,19 +1,22 @@ package com.muyu.product.mapper; import java.util.List; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.product.domain.Brand; /** - * 品牌Mapper接口 - * + * 品牌Mapper extends BaseMapper<>接口 + * * @author Saisai * @date 2024-02-29 */ -public interface BrandMapper +public interface BrandMapper extends BaseMapper { /** * 查询品牌 - * + * * @param id 品牌主键 * @return 品牌 */ @@ -21,7 +24,7 @@ public interface BrandMapper /** * 查询品牌列表 - * + * * @param brand 品牌 * @return 品牌集合 */ @@ -29,7 +32,7 @@ public interface BrandMapper /** * 新增品牌 - * + * * @param brand 品牌 * @return 结果 */ @@ -37,7 +40,7 @@ public interface BrandMapper /** * 修改品牌 - * + * * @param brand 品牌 * @return 结果 */ @@ -45,7 +48,7 @@ public interface BrandMapper /** * 删除品牌 - * + * * @param id 品牌主键 * @return 结果 */ @@ -53,7 +56,7 @@ public interface BrandMapper /** * 批量删除品牌 - * + * * @param ids 需要删除的数据主键集合 * @return 结果 */ diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CategoryAttributeGroupMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CategoryAttributeGroupMapper.java index 6965d24..1111f6e 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CategoryAttributeGroupMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CategoryAttributeGroupMapper.java @@ -1,19 +1,21 @@ package com.muyu.product.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.product.domain.CategoryAttributeGroup; /** - * 品类属性组中间Mapper接口 - * + * 品类属性组中间Mapper extends BaseMapper<>接口 + * * @author saisai * @date 2024-02-29 */ -public interface CategoryAttributeGroupMapper +public interface CategoryAttributeGroupMapper extends BaseMapper { /** * 查询品类属性组中间 - * + * * @param id 品类属性组中间主键 * @return 品类属性组中间 */ @@ -21,7 +23,7 @@ public interface CategoryAttributeGroupMapper /** * 查询品类属性组中间列表 - * + * * @param categoryAttributeGroup 品类属性组中间 * @return 品类属性组中间集合 */ @@ -29,7 +31,7 @@ public interface CategoryAttributeGroupMapper /** * 新增品类属性组中间 - * + * * @param categoryAttributeGroup 品类属性组中间 * @return 结果 */ @@ -37,7 +39,7 @@ public interface CategoryAttributeGroupMapper /** * 修改品类属性组中间 - * + * * @param categoryAttributeGroup 品类属性组中间 * @return 结果 */ @@ -45,7 +47,7 @@ public interface CategoryAttributeGroupMapper /** * 删除品类属性组中间 - * + * * @param id 品类属性组中间主键 * @return 结果 */ @@ -53,7 +55,7 @@ public interface CategoryAttributeGroupMapper /** * 批量删除品类属性组中间 - * + * * @param ids 需要删除的数据主键集合 * @return 结果 */ diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CategoryAttributeMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CategoryAttributeMapper.java index c317727..33114cd 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CategoryAttributeMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CategoryAttributeMapper.java @@ -1,19 +1,21 @@ package com.muyu.product.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.product.domain.CategoryAttribute; /** - * 品类属性中间Mapper接口 - * + * 品类属性中间Mapper extends BaseMapper<>接口 + * * @author Saisai * @date 2024-02-29 */ -public interface CategoryAttributeMapper +public interface CategoryAttributeMapper extends BaseMapper { /** * 查询品类属性中间 - * + * * @param id 品类属性中间主键 * @return 品类属性中间 */ @@ -21,7 +23,7 @@ public interface CategoryAttributeMapper /** * 查询品类属性中间列表 - * + * * @param categoryAttribute 品类属性中间 * @return 品类属性中间集合 */ @@ -29,7 +31,7 @@ public interface CategoryAttributeMapper /** * 新增品类属性中间 - * + * * @param categoryAttribute 品类属性中间 * @return 结果 */ @@ -37,7 +39,7 @@ public interface CategoryAttributeMapper /** * 修改品类属性中间 - * + * * @param categoryAttribute 品类属性中间 * @return 结果 */ @@ -45,7 +47,7 @@ public interface CategoryAttributeMapper /** * 删除品类属性中间 - * + * * @param id 品类属性中间主键 * @return 结果 */ @@ -53,7 +55,7 @@ public interface CategoryAttributeMapper /** * 批量删除品类属性中间 - * + * * @param ids 需要删除的数据主键集合 * @return 结果 */ 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 9968b14..54671ed 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,19 +1,21 @@ package com.muyu.product.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.product.domain.CategoryInfo; /** - * 品类信息Mapper接口 - * + * 品类信息Mapper extends BaseMapper<>接口 + * * @author Saisai * @date 2024-02-29 */ -public interface CategoryInfoMapper +public interface CategoryInfoMapper extends BaseMapper { /** * 查询品类信息 - * + * * @param id 品类信息主键 * @return 品类信息 */ @@ -21,7 +23,7 @@ public interface CategoryInfoMapper /** * 查询品类信息列表 - * + * * @param categoryInfo 品类信息 * @return 品类信息集合 */ @@ -29,7 +31,7 @@ public interface CategoryInfoMapper /** * 新增品类信息 - * + * * @param categoryInfo 品类信息 * @return 结果 */ @@ -37,7 +39,7 @@ public interface CategoryInfoMapper /** * 修改品类信息 - * + * * @param categoryInfo 品类信息 * @return 结果 */ @@ -45,7 +47,7 @@ public interface CategoryInfoMapper /** * 删除品类信息 - * + * * @param id 品类信息主键 * @return 结果 */ @@ -53,7 +55,7 @@ public interface CategoryInfoMapper /** * 批量删除品类信息 - * + * * @param ids 需要删除的数据主键集合 * @return 结果 */ diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProductCategoryMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProductCategoryMapper.java index 62360f0..ad39119 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProductCategoryMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProductCategoryMapper.java @@ -1,19 +1,21 @@ package com.muyu.product.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.product.domain.ProductCategory; /** - * 品类商品中间Mapper接口 - * + * 品类商品中间Mapper extends BaseMapper<>接口 + * * @author Saisai * @date 2024-02-29 */ -public interface ProductCategoryMapper +public interface ProductCategoryMapper extends BaseMapper { /** * 查询品类商品中间 - * + * * @param id 品类商品中间主键 * @return 品类商品中间 */ @@ -21,7 +23,7 @@ public interface ProductCategoryMapper /** * 查询品类商品中间列表 - * + * * @param productCategory 品类商品中间 * @return 品类商品中间集合 */ @@ -29,7 +31,7 @@ public interface ProductCategoryMapper /** * 新增品类商品中间 - * + * * @param productCategory 品类商品中间 * @return 结果 */ @@ -37,7 +39,7 @@ public interface ProductCategoryMapper /** * 修改品类商品中间 - * + * * @param productCategory 品类商品中间 * @return 结果 */ @@ -45,7 +47,7 @@ public interface ProductCategoryMapper /** * 删除品类商品中间 - * + * * @param id 品类商品中间主键 * @return 结果 */ @@ -53,7 +55,7 @@ public interface ProductCategoryMapper /** * 批量删除品类商品中间 - * + * * @param ids 需要删除的数据主键集合 * @return 结果 */ diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProductInfoMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProductInfoMapper.java index 7a45768..29f1acb 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProductInfoMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProductInfoMapper.java @@ -1,19 +1,21 @@ package com.muyu.product.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.product.domain.ProductInfo; /** - * 商品;Mapper接口 - * + * 商品;Mapper extends BaseMapper<>接口 + * * @author Saisai * @date 2024-02-29 */ -public interface ProductInfoMapper +public interface ProductInfoMapper extends BaseMapper { /** * 查询商品; - * + * * @param id 商品;主键 * @return 商品; */ @@ -21,7 +23,7 @@ public interface ProductInfoMapper /** * 查询商品;列表 - * + * * @param productInfo 商品; * @return 商品;集合 */ @@ -29,7 +31,7 @@ public interface ProductInfoMapper /** * 新增商品; - * + * * @param productInfo 商品; * @return 结果 */ @@ -37,7 +39,7 @@ public interface ProductInfoMapper /** * 修改商品; - * + * * @param productInfo 商品; * @return 结果 */ @@ -45,7 +47,7 @@ public interface ProductInfoMapper /** * 删除商品; - * + * * @param id 商品;主键 * @return 结果 */ @@ -53,7 +55,7 @@ public interface ProductInfoMapper /** * 批量删除商品; - * + * * @param ids 需要删除的数据主键集合 * @return 结果 */ diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/RuleMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/RuleMapper.java index 27d2bc2..e67ad24 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/RuleMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/RuleMapper.java @@ -1,19 +1,21 @@ package com.muyu.product.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.product.domain.Rule; /** - * 规格Mapper接口 - * + * 规格Mapper extends BaseMapper<>接口 + * * @author saisai * @date 2024-02-29 */ -public interface RuleMapper +public interface RuleMapper extends BaseMapper { /** * 查询规格 - * + * * @param id 规格主键 * @return 规格 */ @@ -21,7 +23,7 @@ public interface RuleMapper /** * 查询规格列表 - * + * * @param rule 规格 * @return 规格集合 */ @@ -29,7 +31,7 @@ public interface RuleMapper /** * 新增规格 - * + * * @param rule 规格 * @return 结果 */ @@ -37,7 +39,7 @@ public interface RuleMapper /** * 修改规格 - * + * * @param rule 规格 * @return 结果 */ @@ -45,7 +47,7 @@ public interface RuleMapper /** * 删除规格 - * + * * @param id 规格主键 * @return 结果 */ @@ -53,7 +55,7 @@ public interface RuleMapper /** * 批量删除规格 - * + * * @param ids 需要删除的数据主键集合 * @return 结果 */ diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/RuleProductMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/RuleProductMapper.java index df87ece..25c42b8 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/RuleProductMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/RuleProductMapper.java @@ -1,19 +1,21 @@ package com.muyu.product.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.product.domain.RuleProduct; /** - * 规格商品中间Mapper接口 - * + * 规格商品中间Mapper extends BaseMapper<>接口 + * * @author saisai * @date 2024-02-29 */ -public interface RuleProductMapper +public interface RuleProductMapper extends BaseMapper { /** * 查询规格商品中间 - * + * * @param id 规格商品中间主键 * @return 规格商品中间 */ @@ -21,7 +23,7 @@ public interface RuleProductMapper /** * 查询规格商品中间列表 - * + * * @param ruleProduct 规格商品中间 * @return 规格商品中间集合 */ @@ -29,7 +31,7 @@ public interface RuleProductMapper /** * 新增规格商品中间 - * + * * @param ruleProduct 规格商品中间 * @return 结果 */ @@ -37,7 +39,7 @@ public interface RuleProductMapper /** * 修改规格商品中间 - * + * * @param ruleProduct 规格商品中间 * @return 结果 */ @@ -45,7 +47,7 @@ public interface RuleProductMapper /** * 删除规格商品中间 - * + * * @param id 规格商品中间主键 * @return 结果 */ @@ -53,7 +55,7 @@ public interface RuleProductMapper /** * 批量删除规格商品中间 - * + * * @param ids 需要删除的数据主键集合 * @return 结果 */ diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IAddressService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IAddressService.java index 3456d7f..1742997 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IAddressService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IAddressService.java @@ -1,7 +1,10 @@ package com.muyu.product.service; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.product.domain.Address; +import com.muyu.product.domain.CategoryAttribute; /** * 地区Service接口 @@ -9,7 +12,7 @@ import com.muyu.product.domain.Address; * @author Saisai * @date 2024-02-29 */ -public interface IAddressService +public interface IAddressService extends IService
{ /** * 查询地区 diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IAsAttributeGroupService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IAsAttributeGroupService.java index 82767be..86093da 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IAsAttributeGroupService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IAsAttributeGroupService.java @@ -1,19 +1,21 @@ package com.muyu.product.service; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.product.domain.AsAttributeGroup; /** * 属性组中间Service接口 - * + * * @author Saisai * @date 2024-02-29 */ -public interface IAsAttributeGroupService +public interface IAsAttributeGroupService extends IService { /** * 查询属性组中间 - * + * * @param id 属性组中间主键 * @return 属性组中间 */ @@ -21,7 +23,7 @@ public interface IAsAttributeGroupService /** * 查询属性组中间列表 - * + * * @param asAttributeGroup 属性组中间 * @return 属性组中间集合 */ @@ -29,7 +31,7 @@ public interface IAsAttributeGroupService /** * 新增属性组中间 - * + * * @param asAttributeGroup 属性组中间 * @return 结果 */ @@ -37,7 +39,7 @@ public interface IAsAttributeGroupService /** * 修改属性组中间 - * + * * @param asAttributeGroup 属性组中间 * @return 结果 */ @@ -45,7 +47,7 @@ public interface IAsAttributeGroupService /** * 批量删除属性组中间 - * + * * @param ids 需要删除的属性组中间主键集合 * @return 结果 */ @@ -53,7 +55,7 @@ public interface IAsAttributeGroupService /** * 删除属性组中间信息 - * + * * @param id 属性组中间主键 * @return 结果 */ diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IAttributeGroupService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IAttributeGroupService.java index 6dd835f..cea9b3e 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IAttributeGroupService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IAttributeGroupService.java @@ -1,19 +1,23 @@ package com.muyu.product.service; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.product.domain.Address; import com.muyu.product.domain.AttributeGroup; +import com.muyu.product.domain.req.AttributeGroupReq; /** * 属性组Service接口 - * + * * @author muyu * @date 2024-02-29 */ -public interface IAttributeGroupService +public interface IAttributeGroupService extends IService { /** * 查询属性组 - * + * * @param id 属性组主键 * @return 属性组 */ @@ -21,7 +25,7 @@ public interface IAttributeGroupService /** * 查询属性组列表 - * + * * @param attributeGroup 属性组 * @return 属性组集合 */ @@ -29,23 +33,23 @@ public interface IAttributeGroupService /** * 新增属性组 - * - * @param attributeGroup 属性组 + * + * @param attributeGroupReq 属性组 * @return 结果 */ - public int insertAttributeGroup(AttributeGroup attributeGroup); + public int insertAttributeGroup(AttributeGroupReq attributeGroupReq); /** * 修改属性组 - * - * @param attributeGroup 属性组 + * + * @param attributeGroupReq 属性组 * @return 结果 */ - public int updateAttributeGroup(AttributeGroup attributeGroup); + public int updateAttributeGroup(AttributeGroupReq attributeGroupReq); /** * 批量删除属性组 - * + * * @param ids 需要删除的属性组主键集合 * @return 结果 */ @@ -53,7 +57,7 @@ public interface IAttributeGroupService /** * 删除属性组信息 - * + * * @param id 属性组主键 * @return 结果 */ diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IAttributeProductService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IAttributeProductService.java index e135b4c..8ac4f84 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IAttributeProductService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IAttributeProductService.java @@ -1,19 +1,22 @@ package com.muyu.product.service; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.product.domain.Address; import com.muyu.product.domain.AttributeProduct; /** * 商品属性中间表Service接口 - * + * * @author Saisai * @date 2024-02-29 */ -public interface IAttributeProductService +public interface IAttributeProductService extends IService { /** * 查询商品属性中间表 - * + * * @param id 商品属性中间表主键 * @return 商品属性中间表 */ @@ -21,7 +24,7 @@ public interface IAttributeProductService /** * 查询商品属性中间表列表 - * + * * @param attributeProduct 商品属性中间表 * @return 商品属性中间表集合 */ @@ -29,7 +32,7 @@ public interface IAttributeProductService /** * 新增商品属性中间表 - * + * * @param attributeProduct 商品属性中间表 * @return 结果 */ @@ -37,7 +40,7 @@ public interface IAttributeProductService /** * 修改商品属性中间表 - * + * * @param attributeProduct 商品属性中间表 * @return 结果 */ @@ -45,7 +48,7 @@ public interface IAttributeProductService /** * 批量删除商品属性中间表 - * + * * @param ids 需要删除的商品属性中间表主键集合 * @return 结果 */ @@ -53,7 +56,7 @@ public interface IAttributeProductService /** * 删除商品属性中间表信息 - * + * * @param id 商品属性中间表主键 * @return 结果 */ diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IAttributeService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IAttributeService.java index c4fe0ab..9ea7eb0 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IAttributeService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IAttributeService.java @@ -1,6 +1,9 @@ package com.muyu.product.service; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.product.domain.Address; import com.muyu.product.domain.Attribute; /** @@ -9,7 +12,7 @@ import com.muyu.product.domain.Attribute; * @author saisai * @date 2024-02-29 */ -public interface IAttributeService +public interface IAttributeService extends IService { /** * 查询属性 diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IBrandCategoryService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IBrandCategoryService.java index 747081c..3533c8d 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IBrandCategoryService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IBrandCategoryService.java @@ -1,19 +1,22 @@ package com.muyu.product.service; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.product.domain.Address; import com.muyu.product.domain.BrandCategory; /** * 品牌品类中间Service接口 - * + * * @author Saisai * @date 2024-02-29 */ -public interface IBrandCategoryService +public interface IBrandCategoryService extends IService { /** * 查询品牌品类中间 - * + * * @param id 品牌品类中间主键 * @return 品牌品类中间 */ @@ -21,7 +24,7 @@ public interface IBrandCategoryService /** * 查询品牌品类中间列表 - * + * * @param brandCategory 品牌品类中间 * @return 品牌品类中间集合 */ @@ -29,7 +32,7 @@ public interface IBrandCategoryService /** * 新增品牌品类中间 - * + * * @param brandCategory 品牌品类中间 * @return 结果 */ @@ -37,7 +40,7 @@ public interface IBrandCategoryService /** * 修改品牌品类中间 - * + * * @param brandCategory 品牌品类中间 * @return 结果 */ @@ -45,7 +48,7 @@ public interface IBrandCategoryService /** * 批量删除品牌品类中间 - * + * * @param ids 需要删除的品牌品类中间主键集合 * @return 结果 */ @@ -53,7 +56,7 @@ public interface IBrandCategoryService /** * 删除品牌品类中间信息 - * + * * @param id 品牌品类中间主键 * @return 结果 */ diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IBrandService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IBrandService.java index fd5697c..4540265 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IBrandService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IBrandService.java @@ -1,6 +1,9 @@ package com.muyu.product.service; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.product.domain.Address; import com.muyu.product.domain.Brand; import com.muyu.product.domain.req.BrandReq; @@ -10,7 +13,7 @@ import com.muyu.product.domain.req.BrandReq; * @author Saisai * @date 2024-02-29 */ -public interface IBrandService +public interface IBrandService extends IService { /** * 查询品牌 diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ICategoryAttributeGroupService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ICategoryAttributeGroupService.java index bc3bd28..14183cd 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ICategoryAttributeGroupService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ICategoryAttributeGroupService.java @@ -1,19 +1,22 @@ package com.muyu.product.service; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.product.domain.Address; import com.muyu.product.domain.CategoryAttributeGroup; /** * 品类属性组中间Service接口 - * + * * @author saisai * @date 2024-02-29 */ -public interface ICategoryAttributeGroupService +public interface ICategoryAttributeGroupService extends IService { /** * 查询品类属性组中间 - * + * * @param id 品类属性组中间主键 * @return 品类属性组中间 */ @@ -21,7 +24,7 @@ public interface ICategoryAttributeGroupService /** * 查询品类属性组中间列表 - * + * * @param categoryAttributeGroup 品类属性组中间 * @return 品类属性组中间集合 */ @@ -29,7 +32,7 @@ public interface ICategoryAttributeGroupService /** * 新增品类属性组中间 - * + * * @param categoryAttributeGroup 品类属性组中间 * @return 结果 */ @@ -37,7 +40,7 @@ public interface ICategoryAttributeGroupService /** * 修改品类属性组中间 - * + * * @param categoryAttributeGroup 品类属性组中间 * @return 结果 */ @@ -45,7 +48,7 @@ public interface ICategoryAttributeGroupService /** * 批量删除品类属性组中间 - * + * * @param ids 需要删除的品类属性组中间主键集合 * @return 结果 */ @@ -53,7 +56,7 @@ public interface ICategoryAttributeGroupService /** * 删除品类属性组中间信息 - * + * * @param id 品类属性组中间主键 * @return 结果 */ diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ICategoryAttributeService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ICategoryAttributeService.java index 297a5b8..eba2f98 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ICategoryAttributeService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ICategoryAttributeService.java @@ -1,19 +1,21 @@ package com.muyu.product.service; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.product.domain.CategoryAttribute; /** * 品类属性中间Service接口 - * + * * @author Saisai * @date 2024-02-29 */ -public interface ICategoryAttributeService +public interface ICategoryAttributeService extends IService { /** * 查询品类属性中间 - * + * * @param id 品类属性中间主键 * @return 品类属性中间 */ @@ -21,7 +23,7 @@ public interface ICategoryAttributeService /** * 查询品类属性中间列表 - * + * * @param categoryAttribute 品类属性中间 * @return 品类属性中间集合 */ @@ -29,7 +31,7 @@ public interface ICategoryAttributeService /** * 新增品类属性中间 - * + * * @param categoryAttribute 品类属性中间 * @return 结果 */ @@ -37,7 +39,7 @@ public interface ICategoryAttributeService /** * 修改品类属性中间 - * + * * @param categoryAttribute 品类属性中间 * @return 结果 */ @@ -45,7 +47,7 @@ public interface ICategoryAttributeService /** * 批量删除品类属性中间 - * + * * @param ids 需要删除的品类属性中间主键集合 * @return 结果 */ @@ -53,7 +55,7 @@ public interface ICategoryAttributeService /** * 删除品类属性中间信息 - * + * * @param id 品类属性中间主键 * @return 结果 */ diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ICategoryInfoService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ICategoryInfoService.java index d25643d..1328c54 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ICategoryInfoService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ICategoryInfoService.java @@ -1,19 +1,22 @@ package com.muyu.product.service; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.product.domain.Address; import com.muyu.product.domain.CategoryInfo; /** * 品类信息Service接口 - * + * * @author Saisai * @date 2024-02-29 */ -public interface ICategoryInfoService +public interface ICategoryInfoService extends IService { /** * 查询品类信息 - * + * * @param id 品类信息主键 * @return 品类信息 */ @@ -21,7 +24,7 @@ public interface ICategoryInfoService /** * 查询品类信息列表 - * + * * @param categoryInfo 品类信息 * @return 品类信息集合 */ @@ -29,7 +32,7 @@ public interface ICategoryInfoService /** * 新增品类信息 - * + * * @param categoryInfo 品类信息 * @return 结果 */ @@ -37,7 +40,7 @@ public interface ICategoryInfoService /** * 修改品类信息 - * + * * @param categoryInfo 品类信息 * @return 结果 */ @@ -45,7 +48,7 @@ public interface ICategoryInfoService /** * 批量删除品类信息 - * + * * @param ids 需要删除的品类信息主键集合 * @return 结果 */ @@ -53,7 +56,7 @@ public interface ICategoryInfoService /** * 删除品类信息信息 - * + * * @param id 品类信息主键 * @return 结果 */ diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IProductCategoryService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IProductCategoryService.java index 57cd9ce..f093c1d 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IProductCategoryService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IProductCategoryService.java @@ -1,19 +1,22 @@ package com.muyu.product.service; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.product.domain.Address; import com.muyu.product.domain.ProductCategory; /** * 品类商品中间Service接口 - * + * * @author Saisai * @date 2024-02-29 */ -public interface IProductCategoryService +public interface IProductCategoryService extends IService { /** * 查询品类商品中间 - * + * * @param id 品类商品中间主键 * @return 品类商品中间 */ @@ -21,7 +24,7 @@ public interface IProductCategoryService /** * 查询品类商品中间列表 - * + * * @param productCategory 品类商品中间 * @return 品类商品中间集合 */ @@ -29,7 +32,7 @@ public interface IProductCategoryService /** * 新增品类商品中间 - * + * * @param productCategory 品类商品中间 * @return 结果 */ @@ -37,7 +40,7 @@ public interface IProductCategoryService /** * 修改品类商品中间 - * + * * @param productCategory 品类商品中间 * @return 结果 */ @@ -45,7 +48,7 @@ public interface IProductCategoryService /** * 批量删除品类商品中间 - * + * * @param ids 需要删除的品类商品中间主键集合 * @return 结果 */ @@ -53,7 +56,7 @@ public interface IProductCategoryService /** * 删除品类商品中间信息 - * + * * @param id 品类商品中间主键 * @return 结果 */ diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IProductInfoService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IProductInfoService.java index f2b48b2..52de858 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IProductInfoService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IProductInfoService.java @@ -1,19 +1,22 @@ package com.muyu.product.service; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.product.domain.Address; import com.muyu.product.domain.ProductInfo; /** * 商品;Service接口 - * + * * @author Saisai * @date 2024-02-29 */ -public interface IProductInfoService +public interface IProductInfoService extends IService { /** * 查询商品; - * + * * @param id 商品;主键 * @return 商品; */ @@ -21,7 +24,7 @@ public interface IProductInfoService /** * 查询商品;列表 - * + * * @param productInfo 商品; * @return 商品;集合 */ @@ -29,7 +32,7 @@ public interface IProductInfoService /** * 新增商品; - * + * * @param productInfo 商品; * @return 结果 */ @@ -37,7 +40,7 @@ public interface IProductInfoService /** * 修改商品; - * + * * @param productInfo 商品; * @return 结果 */ @@ -45,7 +48,7 @@ public interface IProductInfoService /** * 批量删除商品; - * + * * @param ids 需要删除的商品;主键集合 * @return 结果 */ @@ -53,7 +56,7 @@ public interface IProductInfoService /** * 删除商品;信息 - * + * * @param id 商品;主键 * @return 结果 */ diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IRuleProductService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IRuleProductService.java index c747be3..defe28b 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IRuleProductService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IRuleProductService.java @@ -1,19 +1,22 @@ package com.muyu.product.service; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.product.domain.Address; import com.muyu.product.domain.RuleProduct; /** * 规格商品中间Service接口 - * + * * @author saisai * @date 2024-02-29 */ -public interface IRuleProductService +public interface IRuleProductService extends IService { /** * 查询规格商品中间 - * + * * @param id 规格商品中间主键 * @return 规格商品中间 */ @@ -21,7 +24,7 @@ public interface IRuleProductService /** * 查询规格商品中间列表 - * + * * @param ruleProduct 规格商品中间 * @return 规格商品中间集合 */ @@ -29,7 +32,7 @@ public interface IRuleProductService /** * 新增规格商品中间 - * + * * @param ruleProduct 规格商品中间 * @return 结果 */ @@ -37,7 +40,7 @@ public interface IRuleProductService /** * 修改规格商品中间 - * + * * @param ruleProduct 规格商品中间 * @return 结果 */ @@ -45,7 +48,7 @@ public interface IRuleProductService /** * 批量删除规格商品中间 - * + * * @param ids 需要删除的规格商品中间主键集合 * @return 结果 */ @@ -53,7 +56,7 @@ public interface IRuleProductService /** * 删除规格商品中间信息 - * + * * @param id 规格商品中间主键 * @return 结果 */ diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IRuleService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IRuleService.java index 6a9a568..8f0294f 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IRuleService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IRuleService.java @@ -1,19 +1,22 @@ package com.muyu.product.service; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.product.domain.Address; import com.muyu.product.domain.Rule; /** * 规格Service接口 - * + * * @author saisai * @date 2024-02-29 */ -public interface IRuleService +public interface IRuleService extends IService { /** * 查询规格 - * + * * @param id 规格主键 * @return 规格 */ @@ -21,7 +24,7 @@ public interface IRuleService /** * 查询规格列表 - * + * * @param rule 规格 * @return 规格集合 */ @@ -29,7 +32,7 @@ public interface IRuleService /** * 新增规格 - * + * * @param rule 规格 * @return 结果 */ @@ -37,7 +40,7 @@ public interface IRuleService /** * 修改规格 - * + * * @param rule 规格 * @return 结果 */ @@ -45,7 +48,7 @@ public interface IRuleService /** * 批量删除规格 - * + * * @param ids 需要删除的规格主键集合 * @return 结果 */ @@ -53,7 +56,7 @@ public interface IRuleService /** * 删除规格信息 - * + * * @param id 规格主键 * @return 结果 */ diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AddressServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AddressServiceImpl.java index f01233d..1b940ad 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AddressServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AddressServiceImpl.java @@ -1,6 +1,8 @@ package com.muyu.product.service.impl; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -15,7 +17,7 @@ import com.muyu.product.service.IAddressService; * @date 2024-02-29 */ @Service -public class AddressServiceImpl implements IAddressService +public class AddressServiceImpl extends ServiceImpl implements IAddressService { @Autowired private AddressMapper addressMapper; diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsAttributeGroupServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsAttributeGroupServiceImpl.java index 40841c2..04dd178 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsAttributeGroupServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsAttributeGroupServiceImpl.java @@ -1,6 +1,8 @@ package com.muyu.product.service.impl; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -15,7 +17,8 @@ import com.muyu.product.service.IAsAttributeGroupService; * @date 2024-02-29 */ @Service -public class AsAttributeGroupServiceImpl implements IAsAttributeGroupService +public class AsAttributeGroupServiceImpl extends ServiceImpl + implements IAsAttributeGroupService { @Autowired private AsAttributeGroupMapper asAttributeGroupMapper; 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 61e5627..2c85c23 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 @@ -1,14 +1,20 @@ package com.muyu.product.service.impl; -import java.util.List; -import com.muyu.common.core.utils.DateUtils; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.product.domain.AsAttributeGroup; +import com.muyu.product.domain.Attribute; +import com.muyu.product.domain.AttributeGroup; +import com.muyu.product.domain.req.AttributeGroupReq; import com.muyu.product.mapper.AsAttributeGroupMapper; +import com.muyu.product.mapper.AttributeGroupMapper; +import com.muyu.product.service.IAsAttributeGroupService; +import com.muyu.product.service.IAttributeGroupService; +import com.muyu.product.service.IAttributeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.muyu.product.mapper.AttributeGroupMapper; -import com.muyu.product.domain.AttributeGroup; -import com.muyu.product.service.IAttributeGroupService; + +import java.util.ArrayList; +import java.util.List; /** * 属性组Service业务层处理 @@ -17,13 +23,16 @@ import com.muyu.product.service.IAttributeGroupService; * @date 2024-02-29 */ @Service -public class AttributeGroupServiceImpl implements IAttributeGroupService -{ +public class AttributeGroupServiceImpl extends ServiceImpl + implements IAttributeGroupService { @Autowired private AttributeGroupMapper attributeGroupMapper; @Autowired - private AsAttributeGroupMapper asAttributeGroupMapper; + private IAsAttributeGroupService asAttributeGroupService; + + @Autowired + private IAttributeService attributeService; /** * 查询属性组 @@ -32,9 +41,23 @@ public class AttributeGroupServiceImpl implements IAttributeGroupService * @return 属性组 */ @Override - public AttributeGroup selectAttributeGroupById(Long id) - { - return attributeGroupMapper.selectAttributeGroupById(id); + public AttributeGroup selectAttributeGroupById(Long id) { + AttributeGroup group = attributeGroupMapper.selectAttributeGroupById(id); + setAttributeList(group); + return group; + } + + /** + * 将查出来的组内属性赋值给返回值对象 + * @param group + */ + private void setAttributeList(AttributeGroup group) { + List attributeLongs = new ArrayList<>(); + List asAttributeGroups = asAttributeGroupService.selectAsAttributeGroupList(AsAttributeGroup.builder() + .groupId(group.getId()) + .build()); + asAttributeGroups.forEach(asAttributeGroup -> attributeLongs.add(attributeService.selectAttributeById(asAttributeGroup.getAttributeId()))); + group.setAttributeList(attributeLongs); } /** @@ -44,40 +67,51 @@ public class AttributeGroupServiceImpl implements IAttributeGroupService * @return 属性组 */ @Override - public List selectAttributeGroupList(AttributeGroup attributeGroup) - { - return attributeGroupMapper.selectAttributeGroupList(attributeGroup); + public List selectAttributeGroupList(AttributeGroup attributeGroup) { + List attributeGroups = attributeGroupMapper.selectAttributeGroupList(attributeGroup); + attributeGroups.forEach(this::setAttributeList); + return attributeGroups; } /** * 新增属性组 * - * @param attributeGroup 属性组 + * @param attributeGroupReq 属性组 * @return 结果 */ @Override - public int insertAttributeGroup(AttributeGroup attributeGroup) - { - attributeGroup.setCreateTime(DateUtils.getNowDate()); - int i = attributeGroupMapper.insertAttributeGroup(attributeGroup); - AsAttributeGroup asAttributeGroup = new AsAttributeGroup(); - -// asAttributeGroupMapper.insertAsAttributeGroup(); - - return attributeGroupMapper.insertAttributeGroup(attributeGroup); + public int insertAttributeGroup(AttributeGroupReq attributeGroupReq) { + AttributeGroup group = AttributeGroup.createBuilder(attributeGroupReq); + int i = attributeGroupMapper.insertAttributeGroup(group); + List asAttributeGroups = + attributeGroupReq.getCheckedAttributeIds() + .stream().map(attributeId -> + AsAttributeGroup + .saveBuilder(group.getId(), attributeId)) + .toList(); + asAttributeGroupService.saveBatch(asAttributeGroups); +// asAttributeGroups.forEach(asAttributeGroup -> asAttributeGroupMapper.insertAsAttributeGroup(asAttributeGroup)); + return asAttributeGroups.size(); } /** * 修改属性组 * - * @param attributeGroup 属性组 + * @param attributeGroupReq 属性组 * @return 结果 */ @Override - public int updateAttributeGroup(AttributeGroup attributeGroup) - { - attributeGroup.setUpdateTime(DateUtils.getNowDate()); - return attributeGroupMapper.updateAttributeGroup(attributeGroup); + public int updateAttributeGroup(AttributeGroupReq attributeGroupReq) { + AttributeGroup attributeGroup = AttributeGroupReq.updateBuilder(attributeGroupReq); + int i = attributeGroupMapper.updateAttributeGroup(attributeGroup); + List asAttributeGroups = + attributeGroupReq.getCheckedAttributeIds().stream() + .map(attributeId -> AsAttributeGroup + .saveBuilder(attributeGroup.getId(), attributeId)) + .toList(); +// asAttributeGroupService.saveBatch(asAttributeGroups); + asAttributeGroups.forEach(asAttributeGroup -> asAttributeGroupService.updateAsAttributeGroup(asAttributeGroup)); + return asAttributeGroups.size(); } /** @@ -87,8 +121,7 @@ public class AttributeGroupServiceImpl implements IAttributeGroupService * @return 结果 */ @Override - public int deleteAttributeGroupByIds(Long[] ids) - { + public int deleteAttributeGroupByIds(Long[] ids) { return attributeGroupMapper.deleteAttributeGroupByIds(ids); } @@ -99,8 +132,7 @@ public class AttributeGroupServiceImpl implements IAttributeGroupService * @return 结果 */ @Override - public int deleteAttributeGroupById(Long id) - { + public int deleteAttributeGroupById(Long id) { return attributeGroupMapper.deleteAttributeGroupById(id); } } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeProductServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeProductServiceImpl.java index 431f662..2507d30 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeProductServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeProductServiceImpl.java @@ -1,6 +1,8 @@ package com.muyu.product.service.impl; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -15,7 +17,7 @@ import com.muyu.product.service.IAttributeProductService; * @date 2024-02-29 */ @Service -public class AttributeProductServiceImpl implements IAttributeProductService +public class AttributeProductServiceImpl extends ServiceImpl implements IAttributeProductService { @Autowired private AttributeProductMapper attributeProductMapper; diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeServiceImpl.java index 4da2396..1bd9e49 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeServiceImpl.java @@ -1,6 +1,8 @@ package com.muyu.product.service.impl; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -15,7 +17,7 @@ import com.muyu.product.service.IAttributeService; * @date 2024-02-29 */ @Service -public class AttributeServiceImpl implements IAttributeService +public class AttributeServiceImpl extends ServiceImpl implements IAttributeService { @Autowired private AttributeMapper attributeMapper; diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/BrandCategoryServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/BrandCategoryServiceImpl.java index 883f742..21abf76 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/BrandCategoryServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/BrandCategoryServiceImpl.java @@ -1,6 +1,8 @@ package com.muyu.product.service.impl; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -15,7 +17,7 @@ import com.muyu.product.service.IBrandCategoryService; * @date 2024-02-29 */ @Service -public class BrandCategoryServiceImpl implements IBrandCategoryService +public class BrandCategoryServiceImpl extends ServiceImpl implements IBrandCategoryService { @Autowired private BrandCategoryMapper brandCategoryMapper; diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/BrandServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/BrandServiceImpl.java index d16da12..d7a22e9 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/BrandServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/BrandServiceImpl.java @@ -1,6 +1,8 @@ package com.muyu.product.service.impl; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -15,7 +17,8 @@ import com.muyu.product.service.IBrandService; * @date 2024-02-29 */ @Service -public class BrandServiceImpl implements IBrandService +public class BrandServiceImpl extends ServiceImpl + implements IBrandService { @Autowired private BrandMapper brandMapper; diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CategoryAttributeGroupServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CategoryAttributeGroupServiceImpl.java index 7c9f04a..c1e1395 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CategoryAttributeGroupServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CategoryAttributeGroupServiceImpl.java @@ -1,7 +1,10 @@ package com.muyu.product.service.impl; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.DateUtils; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.muyu.product.mapper.CategoryAttributeGroupMapper; @@ -14,8 +17,10 @@ import com.muyu.product.service.ICategoryAttributeGroupService; * @author saisai * @date 2024-02-29 */ +@Slf4j @Service -public class CategoryAttributeGroupServiceImpl implements ICategoryAttributeGroupService +public class CategoryAttributeGroupServiceImpl extends ServiceImpl + implements ICategoryAttributeGroupService { @Autowired private CategoryAttributeGroupMapper categoryAttributeGroupMapper; diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CategoryAttributeServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CategoryAttributeServiceImpl.java index e07c4ef..82674b8 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CategoryAttributeServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CategoryAttributeServiceImpl.java @@ -1,7 +1,10 @@ package com.muyu.product.service.impl; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.DateUtils; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.muyu.product.mapper.CategoryAttributeMapper; @@ -14,8 +17,9 @@ import com.muyu.product.service.ICategoryAttributeService; * @author Saisai * @date 2024-02-29 */ +@Slf4j @Service -public class CategoryAttributeServiceImpl implements ICategoryAttributeService +public class CategoryAttributeServiceImpl extends ServiceImpl implements ICategoryAttributeService { @Autowired private CategoryAttributeMapper categoryAttributeMapper; 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 38d5636..cf2ca41 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 @@ -1,7 +1,10 @@ package com.muyu.product.service.impl; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.DateUtils; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.muyu.product.mapper.CategoryInfoMapper; @@ -14,12 +17,15 @@ import com.muyu.product.service.ICategoryInfoService; * @author Saisai * @date 2024-02-29 */ +@Slf4j @Service -public class CategoryInfoServiceImpl implements ICategoryInfoService +public class CategoryInfoServiceImpl extends ServiceImpl implements ICategoryInfoService { @Autowired private CategoryInfoMapper categoryInfoMapper; +// @Autowired +// private ICategoryInfoService categoryInfoService; /** * 查询品类信息 * diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProductCategoryServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProductCategoryServiceImpl.java index 99963a9..8a753a8 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProductCategoryServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProductCategoryServiceImpl.java @@ -1,6 +1,8 @@ package com.muyu.product.service.impl; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -15,7 +17,7 @@ import com.muyu.product.service.IProductCategoryService; * @date 2024-02-29 */ @Service -public class ProductCategoryServiceImpl implements IProductCategoryService +public class ProductCategoryServiceImpl extends ServiceImpl implements IProductCategoryService { @Autowired private ProductCategoryMapper productCategoryMapper; diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProductInfoServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProductInfoServiceImpl.java index ffd906a..3c91314 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProductInfoServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProductInfoServiceImpl.java @@ -1,6 +1,8 @@ package com.muyu.product.service.impl; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -15,7 +17,7 @@ import com.muyu.product.service.IProductInfoService; * @date 2024-02-29 */ @Service -public class ProductInfoServiceImpl implements IProductInfoService +public class ProductInfoServiceImpl extends ServiceImpl implements IProductInfoService { @Autowired private ProductInfoMapper productInfoMapper; diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleProductServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleProductServiceImpl.java index 9a5105a..9b396a8 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleProductServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleProductServiceImpl.java @@ -1,6 +1,8 @@ package com.muyu.product.service.impl; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -15,7 +17,7 @@ import com.muyu.product.service.IRuleProductService; * @date 2024-02-29 */ @Service -public class RuleProductServiceImpl implements IRuleProductService +public class RuleProductServiceImpl extends ServiceImpl implements IRuleProductService { @Autowired private RuleProductMapper ruleProductMapper; diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleServiceImpl.java index 6196ae5..b3e9b37 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleServiceImpl.java @@ -1,6 +1,8 @@ package com.muyu.product.service.impl; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -15,7 +17,7 @@ import com.muyu.product.service.IRuleService; * @date 2024-02-29 */ @Service -public class RuleServiceImpl implements IRuleService +public class RuleServiceImpl extends ServiceImpl implements IRuleService { @Autowired private RuleMapper ruleMapper;