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 1afa302..1ce3808 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,4 +80,11 @@ public class AttributeGroup extends BaseEntity { .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 858e035..c35aa83 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 @@ -51,6 +51,7 @@ public class RuleInfo extends BaseEntity { @ApiModelProperty(name = "规格状态", value = "规格状态") private String status; + /** * 查询构造器 */ @@ -82,6 +83,17 @@ public class RuleInfo extends BaseEntity { .build(); } + + /** + * 修改规格状态构造器 + */ + public static RuleInfo editByBuild(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/resp/RuleInfoResp.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/RuleInfoResp.java index 8596383..52a31f0 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/RuleInfoResp.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/RuleInfoResp.java @@ -32,6 +32,8 @@ public class RuleInfoResp extends BaseEntity { /** 规格状态 */ private String status; + private Boolean flan=false; + /** * 规格属性集合 */ 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 de747fb..c5192cd 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 @@ -42,6 +42,10 @@ public class AttributeGroupController extends BaseController { @Autowired private AttributeGroupService attributeGroupService; + + + + /** * 查询属性组列表 */ @@ -116,4 +120,12 @@ public class AttributeGroupController extends BaseController { public Result remove(@PathVariable List ids) { return toAjax(attributeGroupService.removeBatchByIds(ids)); } + + @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 a415e9c..e49fd30 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 @@ -105,6 +105,21 @@ public class RuleInfoController extends BaseController { return toAjax(ruleInfoService.updateById(RuleInfo.editBuild(id,ruleInfoUpdRes))); } + /** + * 修改商品规格状态 + * @param id status + * @return + */ + @RequiresPermissions("product:rule:edit") + @Log(title = "商品规格", businessType = BusinessType.UPDATE) + @PutMapping("/{id}/{status}") + @ApiOperation("/修改商品规格状态") + public Result updateById(@PathVariable Long id,@PathVariable String status){ + return toAjax(ruleInfoService.updateById(RuleInfo.editByBuild(id,status))); + } + + + /** * 删除商品规格 */ diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeGroupUpdMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeGroupUpdMapper.java index 500d9e7..120e3a2 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeGroupUpdMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeGroupUpdMapper.java @@ -1,5 +1,6 @@ package com.muyu.product.mapper; +import com.muyu.product.domain.resp.AttributeGroupUpdResp; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -19,4 +20,6 @@ public interface AttributeGroupUpdMapper { * @param ids */ void attriAddGroup(@Param("id") Long id, @Param("ids") Long ids); + + } 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 dbe6fc4..cc6d9ac 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 @@ -56,11 +56,6 @@ public interface AttributeGroupService extends IService { */ void updAs(Long id, AttributeGroupEditReq attributeGroupEditReq); -// -// /** -// * 修改属性组数据 自己改的 -// * @param attributeGroup -// * @return -// */ -// AttributeGroupUpdResp updByids(AttributeGroup attributeGroup); + + } 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 0fc1f62..a6a7066 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 @@ -149,5 +149,4 @@ public class AttributeGroupServiceImpl extends ServiceImpl private RuleAttrInfoService ruleAttrInfoService; @Autowired private RuleInfoUpdMapper ruleInfoUpdMapper; - + @Autowired + private ProjectInfoService projectInfoService; /** * 查询商品规格列表 @@ -109,10 +117,20 @@ public class RuleInfoServiceImpl extends ServiceImpl .toList(); boolean isPage = ruleInfoQueryReq.getParams().get("isPage") == null || Convert.toBool(ruleInfoQueryReq.getParams().get("isPage"), true); + ruleInfoRespList.forEach(item->{ + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ProjectInfo::getRuleId,item.getId()); + List projectInfos = projectInfoService.list(queryWrapper); + if (!Collections.isEmpty(projectInfos)){ + item.setFlan(true); + } + }); + return TableDataInfo.builder() .rows(ruleInfoRespList) .total(isPage ? new PageInfo<>(list).getTotal() : 0) .build(); + } @Override @@ -125,6 +143,7 @@ public class RuleInfoServiceImpl extends ServiceImpl .id(byId.getId()) .name(byId.getName()) .remark(byId.getRemark()) + .status(byId.getStatus()) .ruleAttrList(list.stream().map(RuleAttrAddModel::infoBuild).toList()).build(); } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AttributeGroupUpdMapper.xml b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AttributeGroupUpdMapper.xml index 3f62747..bd1685d 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AttributeGroupUpdMapper.xml +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AttributeGroupUpdMapper.xml @@ -6,6 +6,7 @@ (#{id},#{ids}) + delete from as_attribute_group where group_id=#{id}