diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/CategoryInfo.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/CategoryInfo.java index 918b02c..110583b 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/CategoryInfo.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/CategoryInfo.java @@ -17,6 +17,7 @@ import com.muyu.product.domain.req.CategoryInfoEditReq; import com.muyu.common.core.web.domain.TreeEntity; import java.util.Date; +import java.util.List; import java.util.function.Function; import java.util.function.Supplier; @@ -102,6 +103,13 @@ public class CategoryInfo extends TreeEntity { .build(); } + public static CategoryInfo updateBuild(Long id, String start){ + return CategoryInfo.builder() + .id(id) + .start(start) + .build(); + } + public static CategoryInfo saveModelBuild(CategoryInfoSaveModel categoryInfoSaveModel) { return CategoryInfo.builder() .name(categoryInfoSaveModel.getName()) 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..30acd20 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 @@ -82,6 +82,16 @@ public class RuleInfo extends BaseEntity { .build(); } + /** + * 修改状态构造器 + */ + public static RuleInfo editUpdBuild(Long id, String status){ + return RuleInfo.builder() + .id(id) + .status(status) + .build(); + } + /** * * @param ruleInfoAddModel 添加模型 @@ -91,7 +101,7 @@ public class RuleInfo extends BaseEntity { public static RuleInfo addModelBuild (RuleInfoAddModel ruleInfoAddModel, Supplier createBy) { return RuleInfo.builder() .name(ruleInfoAddModel.getName()) - .status(ruleInfoAddModel.getStatus()) + .status("Y") .createBy(createBy.get()) .createTime(new Date()) .build(); diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/RuleInfoAddModel.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/RuleInfoAddModel.java index 3adb71c..9f6ef06 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/RuleInfoAddModel.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/RuleInfoAddModel.java @@ -41,4 +41,8 @@ public class RuleInfoAddModel extends BaseEntity { .ruleAttrList(req.getRuleAttrList()) .build(); } + + + + } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryInfoController.java index c942196..70e4a93 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryInfoController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryInfoController.java @@ -117,6 +117,17 @@ public class CategoryInfoController extends BaseController { return b; } + /** + * 修改品类状态 + */ + @RequiresPermissions("product:category:edit") + @Log(title = "品类信息", businessType = BusinessType.UPDATE) + @PutMapping("/{id}/{start}") + @ApiOperation("修改品类状态") + public Result edit(@PathVariable Long id, @PathVariable String start) { + + return toAjax(categoryInfoService.updateById(CategoryInfo.updateBuild(id,start))); + } /** * 删除品类信息 */ 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 d4a1a5c..7b30310 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 @@ -106,6 +106,18 @@ public class RuleInfoController extends BaseController { return b; } + /** + * 修改商品规格状态 + */ + @RequiresPermissions("product:rule:edit") + @Log(title = "商品规格", businessType = BusinessType.UPDATE) + @PutMapping("/{id}/{status}") + @ApiOperation("修改商品规格状态") + public Result edit(@PathVariable Long id, @PathVariable String status) { + + return toAjax(ruleInfoService.updateById(RuleInfo.editUpdBuild(id, status))); + } + /** * 删除商品规格 */