From 3c4909b8a516960e53e1b35b0b6eb6001a48b2c6 Mon Sep 17 00:00:00 2001 From: "feng.li" Date: Thu, 10 Aug 2023 16:21:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=BB=84=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=BB=84=E5=90=8D=E4=B8=8D=E5=8F=AF=E9=87=8D?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/enums/ErrorCodeEnum.java | 3 ++- .../mapper/HyPartnerLabelGroupMapper.xml | 24 +++++++++++++++++++ .../cool/store/entity/HyPartnerLabelDO.java | 2 -- .../cool/store/service/LabelGroupService.java | 2 +- .../service/impl/LabelGroupServiceImpl.java | 8 +++++-- .../controller/LabelGroupController.java | 2 +- 6 files changed, 34 insertions(+), 7 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index 1bebd1297..2441d078f 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -88,7 +88,8 @@ public enum ErrorCodeEnum { OUTBOUND_NUMBER_EXIST(110001, "手机号已存在！", null), - LABEL_GROUP_IN_USE(120001, "请勿删除仍在使用的标签组！", null); + LABEL_GROUP_IN_USE(120001, "该标签组下存在标签，不可删除；请确保该标签组下标签数量为0后再进行删除", null), + LABEL_GROUP_EXIST(120002, "该标签组已存在，请重新输入", null), ; diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelGroupMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelGroupMapper.xml index 7e828ab6f..a91d59e07 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelGroupMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelGroupMapper.xml @@ -28,6 +28,30 @@ select from hy_partner_label_group where deleted = 0 + + and label_group_name = #{labelGroupName} + + + and edit_user_id = #{editUserId} + + + and edit_date = #{editDate} + + + and create_time = #{createTime} + + + and update_time =#{updateTime} + + + and create_user_id = #{createUserId} + + + and update_user_id = #{updateUserId} + + + and remark like concat('%', #{remark}, '%') + diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLabelDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLabelDO.java index 735c255d7..4f0d4d383 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLabelDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLabelDO.java @@ -8,8 +8,6 @@ import lombok.NoArgsConstructor; import java.util.Date; -; - /** * @author Fun Li * @date 2023/08/10 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/LabelGroupService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/LabelGroupService.java index 1cb8686ad..481528b22 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/LabelGroupService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/LabelGroupService.java @@ -25,7 +25,7 @@ public interface LabelGroupService { * 添加标签组 * @param dto 新增标签组信息 */ - void addLabelGroup(LabelGroupAddDTO dto); + void addLabelGroup(LabelGroupAddDTO dto) throws ApiException; /** * 修改标签组信息 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LabelGroupServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LabelGroupServiceImpl.java index b86d101f6..8d6e671b2 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LabelGroupServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LabelGroupServiceImpl.java @@ -47,10 +47,14 @@ public class LabelGroupServiceImpl implements LabelGroupService { * @param dto 新增标签组信息 */ @Override - public void addLabelGroup(LabelGroupAddDTO dto) { + public void addLabelGroup(LabelGroupAddDTO dto) throws ApiException { HyPartnerLabelGroupDO labelGroupDO = new HyPartnerLabelGroupDO(); - String userId = CurrentUserHolder.getUserId(); labelGroupDO.setLabelGroupName(dto.getLabelGroupName()); + List existLabelGroup = labelGroupMapper.selectSelective(labelGroupDO); + if (existLabelGroup != null && existLabelGroup.size() > 0) { + throw new ApiException(ErrorCodeEnum.LABEL_GROUP_EXIST); + } + String userId = CurrentUserHolder.getUserId(); labelGroupDO.setEditUserId(userId); labelGroupDO.setEditDate(new Date()); labelGroupDO.setCreateUserId(userId); diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/LabelGroupController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/LabelGroupController.java index 6ad86e471..c84cfd5cc 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/LabelGroupController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/LabelGroupController.java @@ -41,7 +41,7 @@ public class LabelGroupController { @ApiOperation("新增标签组") @PostMapping({"/add"}) - public ResponseResult addLabelGroup(@RequestBody LabelGroupAddDTO dto) { + public ResponseResult addLabelGroup(@RequestBody LabelGroupAddDTO dto) throws ApiException { labelGroupService.addLabelGroup(dto); return ResponseResult.success(); }