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 e9450e2..cc90f02 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 @@ -80,5 +80,14 @@ public class AttributeGroup extends BaseEntity { .states(attributeGroupEditReq.getStates()) .build(); } + /** + * 修改构造器 + */ + public static AttributeGroup editUpdBuild(Long id, String states){ + return AttributeGroup.builder() + .id(id) + .states(states) + .build(); + } } diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/RuleInfo.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/RuleInfo.java index 454cbad..b004918 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/RuleInfo.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/RuleInfo.java @@ -81,7 +81,15 @@ public class RuleInfo extends BaseEntity { .status(ruleInfoEditReq.getStatus()) .build(); } - + /** + * 修改构造器 + */ + public static RuleInfo editUpdBuild(Long id, String status){ + return RuleInfo.builder() + .id(id) + .status(status) + .build(); + } /** * * @param ruleInfoAddModel 添加模型 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 eb6d762..5c4f0f4 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 @@ -27,7 +27,7 @@ import com.muyu.common.core.web.domain.BaseEntity; public class AttributeGroupEditReq extends BaseEntity { private static final long serialVersionUID = 1L; - + private Long id; /** 组名称 */ @ApiModelProperty(name = "组名称", value = "组名称", required = true) private String name; 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 8618675..6426ecd 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 @@ -44,16 +44,17 @@ public class CategoryInfoEditReq extends TreeEntity { @ApiModelProperty(name = "介绍", value = "介绍") private String introduction; /** - * 商品属性组关联ID + * 属性集合 */ - private List attributeGroupIdList; - /** - * 商品属性关联ID - */ - private List attributeIdList; + private List attributeInfoList; /** - * 商品品牌组关联ID + * 属性组集合 */ - private List brandIdList; + private List attributeGroupList; + + /** + * 品牌集合 + */ + private List brandInfoList; } 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 9fd37a3..0ed89fc 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 @@ -100,7 +100,16 @@ public class AttributeGroupController extends BaseController { attributeGroupService.save(AttributeGroupSaveModel.saveReqBuild(attributeGroupSaveReq)) ); } - + /** + * 修改属性状态 + */ + @RequiresPermissions("product:attributeGroup:edit") + @Log(title = "属性组", businessType = BusinessType.UPDATE) + @PutMapping("/{id}/{states}") + @ApiOperation("修改属性状态") + public Result updStates(@PathVariable Long id,@PathVariable String states) { + return toAjax(attributeGroupService.updateById(AttributeGroup.editUpdBuild(id,states))); + } /** * 修改属性组 */ 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 10b8124..c461144 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 @@ -103,6 +103,16 @@ public class RuleInfoController extends BaseController { ruleInfoService.updateRuleById(id,req); return Result.success(); } + /** + * 修改商品规格 + */ + @RequiresPermissions("product:rule:edit") + @Log(title = "商品规格", businessType = BusinessType.UPDATE) + @PutMapping("/{id}/{status}") + @ApiOperation("修改商品规格状态") + public Result updateRuleStatus(@PathVariable Long id, @PathVariable String status) { + return toAjax(ruleInfoService.updateById(RuleInfo.editUpdBuild(id,status))); + } /** * 删除商品规格 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 8a56641..37bd798 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 @@ -363,7 +363,7 @@ public class CategoryInfoServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(AsCategoryBrand::getCategoryId,id); asCategoryBrandService.remove(lambdaQueryWrapper); - List brandIdList = categoryInfoEditReq.getBrandIdList().stream().map(BrandInfo::getId).toList(); + List brandIdList = categoryInfoEditReq.getBrandInfoList().stream().map(BrandInfo::getId).toList(); asCategoryBrandService.saveBatch( brandIdList.stream().map(brandId ->AsCategoryBrand.categoryBuild(id,brandId)).toList() ); @@ -374,7 +374,7 @@ public class CategoryInfoServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(AsCategoryAttributeGroup::getCategoryId,id); asCategoryAttributeGroupService.remove(wrapper); - List attributeGroupIdList = categoryInfoEditReq.getAttributeGroupIdList().stream().map(AttributeGroup::getId).toList(); + List attributeGroupIdList = categoryInfoEditReq.getAttributeGroupList().stream().map(AttributeGroup::getId).toList(); asCategoryAttributeGroupService.saveBatch( attributeGroupIdList.stream().map(aLong -> AsCategoryAttributeGroup.categoryBuild(id,aLong)).toList() ); @@ -385,7 +385,7 @@ public class CategoryInfoServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(AsCategoryAttribute::getCategoryId,id); asCategoryAttributeService.remove(queryWrapper); - List longList = categoryInfoEditReq.getAttributeIdList().stream().map(AttributeInfo::getId).toList(); + List longList = categoryInfoEditReq.getAttributeInfoList().stream().map(AttributeInfo::getId).toList(); asCategoryAttributeService.saveBatch( longList.stream().map(aLong -> AsCategoryAttribute.categoryBuild(id,aLong)).toList() );