From 791a35029386171bece5ae5a8380e918ed9dac15 Mon Sep 17 00:00:00 2001 From: Yen Date: Fri, 22 Nov 2024 11:55:43 +0800 Subject: [PATCH] =?UTF-8?q?feat(goods):=20=E6=B7=BB=E5=8A=A0=E5=95=86?= =?UTF-8?q?=E5=93=81=E5=88=86=E7=B1=BB=E8=A7=84=E5=88=99=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GoodsCategoryRuleController.java | 33 +++++++++++++++---- .../goods/entity/GoodsCategoryRule.java | 3 ++ .../service/GoodsCategoryRuleService.java | 2 ++ .../impl/GoodsCategoryRuleServiceImpl.java | 13 ++++++++ 4 files changed, 45 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryRuleController.java b/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryRuleController.java index a2bd20a3..de077a3d 100644 --- a/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryRuleController.java +++ b/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryRuleController.java @@ -7,22 +7,16 @@ import com.qs.serve.common.model.dto.R; import com.qs.serve.common.model.enums.BizType; import com.qs.serve.common.model.enums.SystemModule; import com.qs.serve.common.util.PageUtil; -import com.qs.serve.common.util.CopierUtil; import com.qs.serve.common.util.StringUtils; -import com.qs.serve.modules.goods.entity.GoodsCategory; import com.qs.serve.modules.goods.entity.bo.GoodsCategoryRuleBo; -import com.qs.serve.modules.goods.service.GoodsCategoryService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import com.qs.serve.modules.goods.entity.GoodsCategoryRule; import com.qs.serve.modules.goods.service.GoodsCategoryRuleService; import javax.validation.Valid; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** @@ -91,6 +85,7 @@ public class GoodsCategoryRuleController { return R.ok(); } + /** * 新增 * @param param @@ -103,6 +98,32 @@ public class GoodsCategoryRuleController { return R.ok(); } + /** + * 设置默认 + * @param id + * @return + */ + @PostMapping("/setDefault/{id}") + @SysLog(module = SystemModule.GOODS, title = "品牌规则", biz = BizType.INSERT) + public R doSetDefault(@PathVariable("id") String id){ + goodsCategoryRuleService.doSetDefault(id); + return R.ok(); + } + + /** + * 设置默认 + * @param id + * @return + */ + @GetMapping("/getDefaultRule/{id}") + @SysLog(module = SystemModule.GOODS, title = "品牌规则", biz = BizType.INSERT) + public R getDefaultRule(@PathVariable("id") String id){ + GoodsCategoryRule rule = goodsCategoryRuleService.getOne(new LambdaQueryWrapper(). + eq(GoodsCategoryRule::getDefaultFlag,1),false); + return R.ok(rule); + } + + /** * 删除 * @param ids diff --git a/src/main/java/com/qs/serve/modules/goods/entity/GoodsCategoryRule.java b/src/main/java/com/qs/serve/modules/goods/entity/GoodsCategoryRule.java index 299cfca9..c29b7d96 100644 --- a/src/main/java/com/qs/serve/modules/goods/entity/GoodsCategoryRule.java +++ b/src/main/java/com/qs/serve/modules/goods/entity/GoodsCategoryRule.java @@ -59,6 +59,9 @@ public class GoodsCategoryRule implements Serializable { @NotNull(message = "启用状态不能为空") private Integer enableFlag; + /** 是否默认规则 */ + private Integer defaultFlag; + /** 备注 */ @Length(max = 255,message = "备注长度不能超过255字") private String remark; diff --git a/src/main/java/com/qs/serve/modules/goods/service/GoodsCategoryRuleService.java b/src/main/java/com/qs/serve/modules/goods/service/GoodsCategoryRuleService.java index ca8b708b..35332de6 100644 --- a/src/main/java/com/qs/serve/modules/goods/service/GoodsCategoryRuleService.java +++ b/src/main/java/com/qs/serve/modules/goods/service/GoodsCategoryRuleService.java @@ -11,6 +11,8 @@ import com.qs.serve.modules.goods.entity.bo.GoodsCategoryRuleBo; */ public interface GoodsCategoryRuleService extends IService { + void doSetDefault(String id); + GoodsCategoryRule modify(GoodsCategoryRuleBo goodsCategoryRuleBo); } diff --git a/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCategoryRuleServiceImpl.java b/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCategoryRuleServiceImpl.java index b203d514..18203130 100644 --- a/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCategoryRuleServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCategoryRuleServiceImpl.java @@ -2,6 +2,7 @@ package com.qs.serve.modules.goods.service.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.qs.serve.common.util.CopierUtil; import com.qs.serve.modules.goods.entity.GoodsCategory; @@ -30,6 +31,18 @@ public class GoodsCategoryRuleServiceImpl extends ServiceImpl() + .eq(GoodsCategoryRule::getId,id) + .set(GoodsCategoryRule::getDefaultFlag,1)); + // 给非指定的规则设置为非默认 + this.update(new LambdaUpdateWrapper() + .ne(GoodsCategoryRule::getId,id) + .set(GoodsCategoryRule::getDefaultFlag,0)); + } + @Override public GoodsCategoryRule modify(GoodsCategoryRuleBo param) { LambdaQueryWrapper brandCategory = new LambdaQueryWrapper<>();