From fc97ff29eac4a24b7389735af76374aef771a5e5 Mon Sep 17 00:00:00 2001 From: "feng.li" Date: Thu, 10 Aug 2023 19:14:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/enums/ErrorCodeEnum.java | 1 + .../store/mapper/HyPartnerLabelMapper.java | 2 + .../mapper/HyPartnerLabelGroupMapper.xml | 3 + .../resources/mapper/HyPartnerLabelMapper.xml | 141 +++++++++++------- .../cool/store/dto/label/LabelDeleteDTO.java | 16 ++ .../cool/store/dto/label/LabelUpdateDTO.java | 11 ++ .../com/cool/store/service/LabelService.java | 17 ++- .../store/service/impl/LabelServiceImpl.java | 45 +++++- .../store/controller/LabelController.java | 24 ++- 9 files changed, 199 insertions(+), 61 deletions(-) create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/dto/label/LabelDeleteDTO.java 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 2441d078f..cb4fd634a 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 @@ -90,6 +90,7 @@ public enum ErrorCodeEnum { LABEL_GROUP_IN_USE(120001, "该标签组下存在标签，不可删除；请确保该标签组下标签数量为0后再进行删除", null), LABEL_GROUP_EXIST(120002, "该标签组已存在，请重新输入", null), + LABEL_EXIST(120003, "该标签已存在，请重新输入", null), ; diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLabelMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLabelMapper.java index 65c714e9d..581481047 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLabelMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLabelMapper.java @@ -20,6 +20,8 @@ public interface HyPartnerLabelMapper { HyPartnerLabelDO selectByPrimaryKey(Long id); + List selectSelective(HyPartnerLabelDO labelDO); + int updateByPrimaryKeySelective(HyPartnerLabelDO record); int updateByPrimaryKey(HyPartnerLabelDO record); diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelGroupMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelGroupMapper.xml index a91d59e07..d7c523c4a 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelGroupMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelGroupMapper.xml @@ -22,6 +22,7 @@ from hy_partner_label_group where id = #{id} + order by create_time @@ -218,6 +220,7 @@ AND t1.label_group_name LIKE CONCAT('%', #{labelGroupName}, '%') + ORDER BY t1.create_time DESC \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelMapper.xml index 3d83e0444..7f9f453f1 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelMapper.xml @@ -2,17 +2,17 @@ - - - - - - - - - - - + + + + + + + + + + + id, label_group_id, label_name, edit_user_id, edit_date, deleted, create_time, update_time, @@ -22,21 +22,58 @@ select from hy_partner_label - where id = #{id,jdbcType=BIGINT} + where deleted = 0 + and id = #{id} + order by create_time desc + + + delete from hy_partner_label - where id = #{id,jdbcType=BIGINT} + where id = #{id} insert into hy_partner_label (id, label_group_id, label_name, edit_user_id, edit_date, deleted, create_time, update_time, create_user_id, update_user_id, remark) - values (#{id,jdbcType=BIGINT}, #{labelGroupId,jdbcType=BIGINT}, #{labelName,jdbcType=VARCHAR}, - #{editUserId,jdbcType=VARCHAR}, #{editDate,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT}, - #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=VARCHAR}, - #{updateUserId,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}) + values (#{id}, #{labelGroupId}, #{labelName}, + #{editUserId}, #{editDate}, #{deleted}, + #{createTime}, #{updateTime}, #{createUserId}, + #{updateUserId}, #{remark}) insert into hy_partner_label @@ -77,37 +114,37 @@ - #{id,jdbcType=BIGINT}, + #{id}, - #{labelGroupId,jdbcType=BIGINT}, + #{labelGroupId}, - #{labelName,jdbcType=VARCHAR}, + #{labelName}, - #{editUserId,jdbcType=VARCHAR}, + #{editUserId}, - #{editDate,jdbcType=TIMESTAMP}, + #{editDate}, - #{deleted,jdbcType=BIT}, + #{deleted}, - #{createTime,jdbcType=TIMESTAMP}, + #{createTime}, - #{updateTime,jdbcType=TIMESTAMP}, + #{updateTime}, - #{createUserId,jdbcType=VARCHAR}, + #{createUserId}, - #{updateUserId,jdbcType=VARCHAR}, + #{updateUserId}, - #{remark,jdbcType=VARCHAR}, + #{remark}, @@ -115,51 +152,52 @@ update hy_partner_label - label_group_id = #{labelGroupId,jdbcType=BIGINT}, + label_group_id = #{labelGroupId}, - - label_name = #{labelName,jdbcType=VARCHAR}, + + label_name = #{labelName}, - edit_user_id = #{editUserId,jdbcType=VARCHAR}, + edit_user_id = #{editUserId}, - edit_date = #{editDate,jdbcType=TIMESTAMP}, + edit_date = #{editDate}, - deleted = #{deleted,jdbcType=BIT}, + deleted = #{deleted}, - create_time = #{createTime,jdbcType=TIMESTAMP}, + create_time = #{createTime}, - update_time = #{updateTime,jdbcType=TIMESTAMP}, + update_time = #{updateTime}, - create_user_id = #{createUserId,jdbcType=VARCHAR}, + create_user_id = #{createUserId}, - update_user_id = #{updateUserId,jdbcType=VARCHAR}, + update_user_id = #{updateUserId}, - remark = #{remark,jdbcType=VARCHAR}, + remark = #{remark}, - where id = #{id,jdbcType=BIGINT} + where deleted = 0 + and id = #{id} update hy_partner_label - set label_group_id = #{labelGroupId,jdbcType=BIGINT}, - label_name = #{labelName,jdbcType=VARCHAR}, - edit_user_id = #{editUserId,jdbcType=VARCHAR}, - edit_date = #{editDate,jdbcType=TIMESTAMP}, - deleted = #{deleted,jdbcType=BIT}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP}, - create_user_id = #{createUserId,jdbcType=VARCHAR}, - update_user_id = #{updateUserId,jdbcType=VARCHAR}, - remark = #{remark,jdbcType=VARCHAR} - where id = #{id,jdbcType=BIGINT} + set label_group_id = #{labelGroupId}, + label_name = #{labelName}, + edit_user_id = #{editUserId}, + edit_date = #{editDate}, + deleted = #{deleted}, + create_time = #{createTime}, + update_time = #{updateTime}, + create_user_id = #{createUserId}, + update_user_id = #{updateUserId}, + remark = #{remark} + where id = #{id}