From b10f129271106846110ec48ae03e51514055111b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Thu, 24 Jul 2025 17:28:42 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=BA=8B=E9=A1=B9=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/enums/notice/MatterTypeEnum.java | 43 ++ .../store/enums/notice/ModuleCodeEnum.java | 54 ++ .../store/enums/notice/ProcessStatusEnum.java | 40 ++ .../store/enums/notice/ProcessTypeEnum.java | 40 ++ .../store/enums/notice/PublishStatusEnum.java | 42 ++ .../store/enums/notice/ReadStatusEnum.java | 39 ++ .../store/enums/notice/RemindTypeEnum.java | 40 ++ .../store/enums/notice/RevokeStatusEnum.java | 39 ++ .../store/enums/notice/SystemSourceEnum.java | 38 ++ .../com/cool/store/dao/MatterConfigDAO.java | 54 ++ .../cool/store/mapper/MatterConfigMapper.java | 33 + .../store/mapper/MessageTemplateMapper.java | 7 + .../cool/store/mapper/StoreMessageMapper.java | 7 + .../resources/mapper/MatterConfigMapper.xml | 78 +++ .../mapper/MessageTemplateMapper.xml | 33 + .../resources/mapper/StoreMessageMapper.xml | 27 + .../com/cool/store/dto/notice/CommonDTO.java | 25 + .../com/cool/store/entity/MatterConfigDO.java | 365 +++++++++++ .../cool/store/entity/MessageTemplateDO.java | 582 ++++++++++++++++++ .../com/cool/store/entity/StoreMessageDO.java | 440 +++++++++++++ .../notice/MatterConfigAddRequest.java | 49 ++ .../notice/MatterConfigDeletedRequest.java | 18 + .../notice/MatterConfigQueryRequest.java | 22 + .../vo/notice/MatterAndMatterDetailVO.java | 44 ++ .../store/vo/notice/ModuleAndMatterVO.java | 59 ++ .../store/service/MatterConfigService.java | 57 ++ .../service/impl/MatterConfigServiceImpl.java | 83 +++ .../controller/webb/CommonEnumController.java | 39 ++ .../webb/MatterConfigController.java | 65 ++ 29 files changed, 2462 insertions(+) create mode 100644 coolstore-partner-common/src/main/java/com/cool/store/enums/notice/MatterTypeEnum.java create mode 100644 coolstore-partner-common/src/main/java/com/cool/store/enums/notice/ModuleCodeEnum.java create mode 100644 coolstore-partner-common/src/main/java/com/cool/store/enums/notice/ProcessStatusEnum.java create mode 100644 coolstore-partner-common/src/main/java/com/cool/store/enums/notice/ProcessTypeEnum.java create mode 100644 coolstore-partner-common/src/main/java/com/cool/store/enums/notice/PublishStatusEnum.java create mode 100644 coolstore-partner-common/src/main/java/com/cool/store/enums/notice/ReadStatusEnum.java create mode 100644 coolstore-partner-common/src/main/java/com/cool/store/enums/notice/RemindTypeEnum.java create mode 100644 coolstore-partner-common/src/main/java/com/cool/store/enums/notice/RevokeStatusEnum.java create mode 100644 coolstore-partner-common/src/main/java/com/cool/store/enums/notice/SystemSourceEnum.java create mode 100644 coolstore-partner-dao/src/main/java/com/cool/store/dao/MatterConfigDAO.java create mode 100644 coolstore-partner-dao/src/main/java/com/cool/store/mapper/MatterConfigMapper.java create mode 100644 coolstore-partner-dao/src/main/java/com/cool/store/mapper/MessageTemplateMapper.java create mode 100644 coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMessageMapper.java create mode 100644 coolstore-partner-dao/src/main/resources/mapper/MatterConfigMapper.xml create mode 100644 coolstore-partner-dao/src/main/resources/mapper/MessageTemplateMapper.xml create mode 100644 coolstore-partner-dao/src/main/resources/mapper/StoreMessageMapper.xml create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/dto/notice/CommonDTO.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/entity/MatterConfigDO.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/entity/MessageTemplateDO.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/entity/StoreMessageDO.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/request/notice/MatterConfigAddRequest.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/request/notice/MatterConfigDeletedRequest.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/request/notice/MatterConfigQueryRequest.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/vo/notice/MatterAndMatterDetailVO.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/vo/notice/ModuleAndMatterVO.java create mode 100644 coolstore-partner-service/src/main/java/com/cool/store/service/MatterConfigService.java create mode 100644 coolstore-partner-service/src/main/java/com/cool/store/service/impl/MatterConfigServiceImpl.java create mode 100644 coolstore-partner-web/src/main/java/com/cool/store/controller/webb/CommonEnumController.java create mode 100644 coolstore-partner-web/src/main/java/com/cool/store/controller/webb/MatterConfigController.java diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/notice/MatterTypeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/notice/MatterTypeEnum.java new file mode 100644 index 000000000..9d94dde40 --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/notice/MatterTypeEnum.java @@ -0,0 +1,43 @@ +package com.cool.store.enums.notice; + +/** + * @Author suzhuhong + * @Date 2025/7/24 14:03 + * @Version 1.0 + */ +public enum MatterTypeEnum { + + QUESTION(0,"门店违规工单"), + LICENSE(1,"证照过期提醒"), + NOTICE(2,"通知消息"), + ; + + MatterTypeEnum(Integer code, String message) { + this.code = code; + this.message = message; + } + + private Integer code; + + private String message; + + public Integer getCode() { + return code; + } + + public void setCode(Integer code) { + this.code = code; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + + + +} diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/notice/ModuleCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/notice/ModuleCodeEnum.java new file mode 100644 index 000000000..44313676d --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/notice/ModuleCodeEnum.java @@ -0,0 +1,54 @@ +package com.cool.store.enums.notice; + +import java.util.Arrays; +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2025/7/24 13:59 + * @Version 1.0 + */ +public enum ModuleCodeEnum { + + STORE_WORK(0,"店务", Arrays.asList(MatterTypeEnum.QUESTION,MatterTypeEnum.LICENSE)), + PRODUCT_UPDATE(1,"营销政策/产品上新",Arrays.asList(MatterTypeEnum.NOTICE)), + INVENTORY_MODULE(2,"库存模块",Arrays.asList()), + DISH(3,"菜品",Arrays.asList()), + ; + + ModuleCodeEnum(Integer code, String message,List matterTypeEnums) { + this.code = code; + this.message = message; + this.matterTypeEnums = matterTypeEnums; + } + + private Integer code; + + private String message; + + private List matterTypeEnums; + + public Integer getCode() { + return code; + } + + public void setCode(Integer code) { + this.code = code; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public List getMatterTypeEnums() { + return matterTypeEnums; + } + + public void setMatterTypeEnums(List matterTypeEnums) { + this.matterTypeEnums = matterTypeEnums; + } +} diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/notice/ProcessStatusEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/notice/ProcessStatusEnum.java new file mode 100644 index 000000000..e33277017 --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/notice/ProcessStatusEnum.java @@ -0,0 +1,40 @@ +package com.cool.store.enums.notice; + +/** + * @Author suzhuhong + * @Date 2025/7/24 13:50 + * @Version 1.0 + */ +public enum ProcessStatusEnum { + + UNTREATED(0,"未处理"), + PROCESSED(1,"已处理"), + ; + + ProcessStatusEnum(Integer code, String message) { + this.code = code; + this.message = message; + } + + private Integer code; + + private String message; + + public Integer getCode() { + return code; + } + + public void setCode(Integer code) { + this.code = code; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + +} diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/notice/ProcessTypeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/notice/ProcessTypeEnum.java new file mode 100644 index 000000000..abea956f6 --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/notice/ProcessTypeEnum.java @@ -0,0 +1,40 @@ +package com.cool.store.enums.notice; + +/** + * @Author suzhuhong + * @Date 2025/7/24 13:54 + * @Version 1.0 + */ +public enum ProcessTypeEnum { + + READ(0,"仅阅读"), + HANDLE(1,"需处理"), + ; + + ProcessTypeEnum(Integer code, String message) { + this.code = code; + this.message = message; + } + + private Integer code; + + private String message; + + public Integer getCode() { + return code; + } + + public void setCode(Integer code) { + this.code = code; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + +} diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/notice/PublishStatusEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/notice/PublishStatusEnum.java new file mode 100644 index 000000000..a80c447c6 --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/notice/PublishStatusEnum.java @@ -0,0 +1,42 @@ +package com.cool.store.enums.notice; + +/** + * @Author suzhuhong + * @Date 2025/7/24 13:52 + * @Version 1.0 + */ +public enum PublishStatusEnum { + + UNPUBLISHED(0,"未发布"), + PUBLISHED(1,"已发布"), + REVOKED(2,"已撤销"), + ; + + PublishStatusEnum(Integer code, String message) { + this.code = code; + this.message = message; + } + + private Integer code; + + private String message; + + public Integer getCode() { + return code; + } + + public void setCode(Integer code) { + this.code = code; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + + +} diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/notice/ReadStatusEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/notice/ReadStatusEnum.java new file mode 100644 index 000000000..d2de9afbd --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/notice/ReadStatusEnum.java @@ -0,0 +1,39 @@ +package com.cool.store.enums.notice; + +/** + * @Author suzhuhong + * @Date 2025/7/24 11:29 + * @Version 1.0 + */ +public enum ReadStatusEnum { + + UNREAD(0,"未读"), + READ(1,"已读"), + ; + + + ReadStatusEnum(Integer code, String message) { + this.code = code; + this.message = message; + } + + private Integer code; + + private String message; + + public Integer getCode() { + return code; + } + + public void setCode(Integer code) { + this.code = code; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } +} diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/notice/RemindTypeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/notice/RemindTypeEnum.java new file mode 100644 index 000000000..86edff063 --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/notice/RemindTypeEnum.java @@ -0,0 +1,40 @@ +package com.cool.store.enums.notice; + +/** + * @Author suzhuhong + * @Date 2025/7/24 13:57 + * @Version 1.0 + */ +public enum RemindTypeEnum { + + CONTINUOUS_REMINDER(0,"持续提醒"), + STAGE_REMINDER(1,"阶段提醒"), + ; + + RemindTypeEnum(Integer code, String message) { + this.code = code; + this.message = message; + } + + private Integer code; + + private String message; + + public Integer getCode() { + return code; + } + + public void setCode(Integer code) { + this.code = code; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + +} diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/notice/RevokeStatusEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/notice/RevokeStatusEnum.java new file mode 100644 index 000000000..dacb4f011 --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/notice/RevokeStatusEnum.java @@ -0,0 +1,39 @@ +package com.cool.store.enums.notice; + +/** + * @Author suzhuhong + * @Date 2025/7/24 11:33 + * @Version 1.0 + */ +public enum RevokeStatusEnum { + + NOT_REVOKE(0,"未撤销"), + REVOKE(1,"已撤销"), + ; + + RevokeStatusEnum(Integer code, String message) { + this.code = code; + this.message = message; + } + + private Integer code; + + private String message; + + public Integer getCode() { + return code; + } + + public void setCode(Integer code) { + this.code = code; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + +} diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/notice/SystemSourceEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/notice/SystemSourceEnum.java new file mode 100644 index 000000000..a3bacbf7a --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/notice/SystemSourceEnum.java @@ -0,0 +1,38 @@ +package com.cool.store.enums.notice; + +/** + * @Author suzhuhong + * @Date 2025/7/24 14:41 + * @Version 1.0 + */ +public enum SystemSourceEnum { + + QUESTION(0,"CRM"), + ; + + SystemSourceEnum(Integer code, String message) { + this.code = code; + this.message = message; + } + + private Integer code; + + private String message; + + public Integer getCode() { + return code; + } + + public void setCode(Integer code) { + this.code = code; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + +} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/MatterConfigDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/MatterConfigDAO.java new file mode 100644 index 000000000..be2112491 --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/MatterConfigDAO.java @@ -0,0 +1,54 @@ +package com.cool.store.dao; + +import com.cool.store.entity.MatterConfigDO; +import com.cool.store.mapper.MatterConfigMapper; +import com.cool.store.request.notice.MatterConfigQueryRequest; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Repository; + +import javax.annotation.Resource; +import java.util.Arrays; +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2025/7/24 14:22 + * @Version 1.0 + */ +@Slf4j +@Repository +public class MatterConfigDAO { + + @Resource + MatterConfigMapper matterConfigMapper; + + public int insert(MatterConfigDO matterConfigDO){ + return matterConfigMapper.insertSelective(matterConfigDO); + } + + public int update(MatterConfigDO matterConfigDO){ + return matterConfigMapper.updateByPrimaryKeySelective(matterConfigDO); + } + + public MatterConfigDO getById(Long id){ + return matterConfigMapper.selectByPrimaryKey(id); + } + + public int updateForce(MatterConfigDO matterConfigDO){ + return matterConfigMapper.updateForce(matterConfigDO); + } + + public int batchDelete(List ids, String userId){ + if (CollectionUtils.isEmpty(ids)){ + return 0; + } + return matterConfigMapper.updateDeleteStatus(ids,userId); + } + + public List ListByCondition(MatterConfigQueryRequest request){ + return matterConfigMapper.ListByCondition(request); + } + + +} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/MatterConfigMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/MatterConfigMapper.java new file mode 100644 index 000000000..7f41993f9 --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/MatterConfigMapper.java @@ -0,0 +1,33 @@ +package com.cool.store.mapper; + +import com.cool.store.entity.MatterConfigDO; +import com.cool.store.request.notice.MatterConfigQueryRequest; +import org.apache.ibatis.annotations.Param; +import tk.mybatis.mapper.common.Mapper; + +import java.util.List; + +public interface MatterConfigMapper extends Mapper { + + + /** + * 强制修改 + * @param matterConfigDO + * @return + */ + int updateForce(@Param("matterConfigDO") MatterConfigDO matterConfigDO); + + /** + * 批量修改删除状态 + */ + int updateDeleteStatus(@Param("ids") List ids, @Param("userId") String userId); + + + /** + * 条件查询 + * @param request + * @return + */ + List ListByCondition(@Param("request") MatterConfigQueryRequest request); + +} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/MessageTemplateMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/MessageTemplateMapper.java new file mode 100644 index 000000000..52501eae2 --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/MessageTemplateMapper.java @@ -0,0 +1,7 @@ +package com.cool.store.mapper; + +import com.cool.store.entity.MessageTemplateDO; +import tk.mybatis.mapper.common.Mapper; + +public interface MessageTemplateMapper extends Mapper { +} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMessageMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMessageMapper.java new file mode 100644 index 000000000..519eef64e --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMessageMapper.java @@ -0,0 +1,7 @@ +package com.cool.store.mapper; + +import com.cool.store.entity.StoreMessageDO; +import tk.mybatis.mapper.common.Mapper; + +public interface StoreMessageMapper extends Mapper { +} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/MatterConfigMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/MatterConfigMapper.xml new file mode 100644 index 000000000..997727da5 --- /dev/null +++ b/coolstore-partner-dao/src/main/resources/mapper/MatterConfigMapper.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + UPDATE zxjp_matter_config + SET + module_code = #{matterConfigDO.moduleCode,jdbcType=TINYINT}, + matter_type = #{matterConfigDO.matterType,jdbcType=TINYINT}, + system_source = #{matterConfigDO.systemSource,jdbcType=VARCHAR}, + jump_type = #{matterConfigDO.jumpType,jdbcType=BIT}, + jump_url = #{matterConfigDO.jumpUrl,jdbcType=VARCHAR}, + status = #{matterConfigDO.status,jdbcType=BIT}, + remark = #{matterConfigDO.remark,jdbcType=VARCHAR}, + update_time = now(), + update_user_id = #{matterConfigDO.updateUserId,jdbcType=VARCHAR}, + default_handle_person_info = #{matterConfigDO.defaultHandlePersonInfo,jdbcType=LONGVARCHAR}, + default_store_info = #{matterConfigDO.defaultStoreInfo,jdbcType=LONGVARCHAR} + WHERE id = #{matterConfigDO.id,jdbcType=BIGINT} + + + + + UPDATE zxjp_matter_config + SET + deleted = 1, + update_time = now(), + update_user_id = #{userId,jdbcType=VARCHAR} + WHERE id IN + + #{id,jdbcType=BIGINT} + + + + + + + + + \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/MessageTemplateMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/MessageTemplateMapper.xml new file mode 100644 index 000000000..a7e725cad --- /dev/null +++ b/coolstore-partner-dao/src/main/resources/mapper/MessageTemplateMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/StoreMessageMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/StoreMessageMapper.xml new file mode 100644 index 000000000..504196071 --- /dev/null +++ b/coolstore-partner-dao/src/main/resources/mapper/StoreMessageMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/notice/CommonDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/notice/CommonDTO.java new file mode 100644 index 000000000..180fe33de --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/notice/CommonDTO.java @@ -0,0 +1,25 @@ +package com.cool.store.dto.notice; + +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author suzhuhong + * @Date 2025/7/24 15:27 + * @Version 1.0 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class CommonDTO { + + @ApiModelProperty("类型") + private String type; + @ApiModelProperty("ID值") + private String value; + @ApiModelProperty("名称") + private String name; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/MatterConfigDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/MatterConfigDO.java new file mode 100644 index 000000000..a5239081f --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/MatterConfigDO.java @@ -0,0 +1,365 @@ +package com.cool.store.entity; + +import java.util.Date; +import javax.persistence.*; + +@Table(name = "zxjp_matter_config") +public class MatterConfigDO { + /** + * 主键ID + */ + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + /** + * 模块编码 + */ + @Column(name = "module_code") + private Integer moduleCode; + + /** + * 事项类型 + */ + @Column(name = "matter_type") + private Integer matterType; + + /** + * 系统来源 + */ + @Column(name = "system_source") + private String systemSource; + + /** + * 跳转方式(1:H5 2:小程序 ) + */ + @Column(name = "jump_type") + private Boolean jumpType; + + /** + * 跳转链接 + */ + @Column(name = "jump_url") + private String jumpUrl; + + /** + * 状态(0:禁用 1:启用) + */ + private Boolean status; + + /** + * 备注 + */ + private String remark; + + /** + * 创建时间 + */ + @Column(name = "create_time") + private Date createTime; + + /** + * 创建人 + */ + @Column(name = "create_user_id") + private String createUserId; + + /** + * 更新时间 + */ + @Column(name = "update_time") + private Date updateTime; + + /** + * 更新人 + */ + @Column(name = "update_user_id") + private String updateUserId; + + /** + * 删除标记(0:未删除 1:已删除) + */ + private Boolean deleted; + + /** + * 默认处理人信息 [{type:person,value:}{type:position,value:}] + */ + @Column(name = "default_handle_person_info") + private String defaultHandlePersonInfo; + + /** + * 默认门店范围 [{type:store,value:}{type:region,value:}] + */ + @Column(name = "default_store_info") + private String defaultStoreInfo; + + /** + * 获取主键ID + * + * @return id - 主键ID + */ + public Long getId() { + return id; + } + + /** + * 设置主键ID + * + * @param id 主键ID + */ + public void setId(Long id) { + this.id = id; + } + + /** + * 获取模块编码 + * + * @return module_code - 模块编码 + */ + public Integer getModuleCode() { + return moduleCode; + } + + /** + * 设置模块编码 + * + * @param moduleCode 模块编码 + */ + public void setModuleCode(Integer moduleCode) { + this.moduleCode = moduleCode; + } + + /** + * 获取事项类型 + * + * @return matter_type - 事项类型 + */ + public Integer getMatterType() { + return matterType; + } + + /** + * 设置事项类型 + * + * @param matterType 事项类型 + */ + public void setMatterType(Integer matterType) { + this.matterType = matterType; + } + + /** + * 获取系统来源 + * + * @return system_source - 系统来源 + */ + public String getSystemSource() { + return systemSource; + } + + /** + * 设置系统来源 + * + * @param systemSource 系统来源 + */ + public void setSystemSource(String systemSource) { + this.systemSource = systemSource; + } + + /** + * 获取跳转方式(1:H5 2:小程序 ) + * + * @return jump_type - 跳转方式(1:H5 2:小程序 ) + */ + public Boolean getJumpType() { + return jumpType; + } + + /** + * 设置跳转方式(1:H5 2:小程序 ) + * + * @param jumpType 跳转方式(1:H5 2:小程序 ) + */ + public void setJumpType(Boolean jumpType) { + this.jumpType = jumpType; + } + + /** + * 获取跳转链接 + * + * @return jump_url - 跳转链接 + */ + public String getJumpUrl() { + return jumpUrl; + } + + /** + * 设置跳转链接 + * + * @param jumpUrl 跳转链接 + */ + public void setJumpUrl(String jumpUrl) { + this.jumpUrl = jumpUrl; + } + + /** + * 获取状态(0:禁用 1:启用) + * + * @return status - 状态(0:禁用 1:启用) + */ + public Boolean getStatus() { + return status; + } + + /** + * 设置状态(0:禁用 1:启用) + * + * @param status 状态(0:禁用 1:启用) + */ + public void setStatus(Boolean status) { + this.status = status; + } + + /** + * 获取备注 + * + * @return remark - 备注 + */ + public String getRemark() { + return remark; + } + + /** + * 设置备注 + * + * @param remark 备注 + */ + public void setRemark(String remark) { + this.remark = remark; + } + + /** + * 获取创建时间 + * + * @return create_time - 创建时间 + */ + public Date getCreateTime() { + return createTime; + } + + /** + * 设置创建时间 + * + * @param createTime 创建时间 + */ + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + /** + * 获取创建人 + * + * @return create_user_id - 创建人 + */ + public String getCreateUserId() { + return createUserId; + } + + /** + * 设置创建人 + * + * @param createUserId 创建人 + */ + public void setCreateUserId(String createUserId) { + this.createUserId = createUserId; + } + + /** + * 获取更新时间 + * + * @return update_time - 更新时间 + */ + public Date getUpdateTime() { + return updateTime; + } + + /** + * 设置更新时间 + * + * @param updateTime 更新时间 + */ + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + /** + * 获取更新人 + * + * @return update_user_id - 更新人 + */ + public String getUpdateUserId() { + return updateUserId; + } + + /** + * 设置更新人 + * + * @param updateUserId 更新人 + */ + public void setUpdateUserId(String updateUserId) { + this.updateUserId = updateUserId; + } + + /** + * 获取删除标记(0:未删除 1:已删除) + * + * @return deleted - 删除标记(0:未删除 1:已删除) + */ + public Boolean getDeleted() { + return deleted; + } + + /** + * 设置删除标记(0:未删除 1:已删除) + * + * @param deleted 删除标记(0:未删除 1:已删除) + */ + public void setDeleted(Boolean deleted) { + this.deleted = deleted; + } + + /** + * 获取默认处理人信息 [{type:person,value:}{type:position,value:}] + * + * @return default_handle_person_info - 默认处理人信息 [{type:person,value:}{type:position,value:}] + */ + public String getDefaultHandlePersonInfo() { + return defaultHandlePersonInfo; + } + + /** + * 设置默认处理人信息 [{type:person,value:}{type:position,value:}] + * + * @param defaultHandlePersonInfo 默认处理人信息 [{type:person,value:}{type:position,value:}] + */ + public void setDefaultHandlePersonInfo(String defaultHandlePersonInfo) { + this.defaultHandlePersonInfo = defaultHandlePersonInfo; + } + + /** + * 获取默认门店范围 [{type:store,value:}{type:region,value:}] + * + * @return default_store_info - 默认门店范围 [{type:store,value:}{type:region,value:}] + */ + public String getDefaultStoreInfo() { + return defaultStoreInfo; + } + + /** + * 设置默认门店范围 [{type:store,value:}{type:region,value:}] + * + * @param defaultStoreInfo 默认门店范围 [{type:store,value:}{type:region,value:}] + */ + public void setDefaultStoreInfo(String defaultStoreInfo) { + this.defaultStoreInfo = defaultStoreInfo; + } +} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/MessageTemplateDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/MessageTemplateDO.java new file mode 100644 index 000000000..91cf7c1d1 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/MessageTemplateDO.java @@ -0,0 +1,582 @@ +package com.cool.store.entity; + +import java.util.Date; +import javax.persistence.*; + +@Table(name = "zxjp_message_template") +public class MessageTemplateDO { + /** + * 主键ID + */ + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + /** + * 消息编码(唯一标识) + */ + @Column(name = "message_code") + private String messageCode; + + /** + * 模块编码 + */ + @Column(name = "module_code") + private Integer moduleCode; + + /** + * 事项类型 + */ + @Column(name = "matter_type") + private Integer matterType; + + /** + * 消息标题 + */ + @Column(name = "message_title") + private String messageTitle; + + /** + * 系统来源 + */ + @Column(name = "system_source") + private String systemSource; + + /** + * 处理类型(1:仅阅读 2:需要处理) + */ + @Column(name = "process_type") + private Integer processType; + + /** + * 提醒类型(1:持续提醒 2:阶段提醒 ) + */ + @Column(name = "remind_type") + private Integer remindType; + + /** + * 提醒时间段 开始时间 + */ + @Column(name = "remind_start_time") + private Date remindStartTime; + + /** + * 提醒时间段 结束时间 + */ + @Column(name = "remind_end_time") + private Date remindEndTime; + + /** + * 截止日期 + */ + private Date deadline; + + /** + * 今日必办标识(0:否 1:是) + */ + @Column(name = "today_task") + private Boolean todayTask; + + /** + * 消息图片URL + */ + @Column(name = "message_image") + private String messageImage; + + /** + * 发布状态(0:未发布 1:已发布 2:已撤销) + */ + @Column(name = "publish_status") + private Boolean publishStatus; + + /** + * 发布时间 + */ + @Column(name = "publish_time") + private Date publishTime; + + /** + * 发布人ID + */ + @Column(name = "publisher_user_id") + private Long publisherUserId; + + /** + * 创建人ID + */ + @Column(name = "create_user_id") + private Long createUserId; + + /** + * 创建时间 + */ + @Column(name = "create_time") + private Date createTime; + + /** + * 更新人ID + */ + @Column(name = "updater_user_id") + private Long updaterUserId; + + /** + * 更新时间 + */ + @Column(name = "update_time") + private Date updateTime; + + /** + * 删除标记(0:未删除 1:已删除) + */ + private Boolean deleted; + + /** + * 消息详情(富文本内容) + */ + @Column(name = "message_content") + private String messageContent; + + /** + * 处理人信息 [{type:person,value:}{type:position,value:}] + */ + @Column(name = "handle_person_info") + private String handlePersonInfo; + + /** + * 门店范围 [{type:store,value:}{type:region,value:}] + */ + @Column(name = "store_info") + private String storeInfo; + + /** + * 获取主键ID + * + * @return id - 主键ID + */ + public Long getId() { + return id; + } + + /** + * 设置主键ID + * + * @param id 主键ID + */ + public void setId(Long id) { + this.id = id; + } + + /** + * 获取消息编码(唯一标识) + * + * @return message_code - 消息编码(唯一标识) + */ + public String getMessageCode() { + return messageCode; + } + + /** + * 设置消息编码(唯一标识) + * + * @param messageCode 消息编码(唯一标识) + */ + public void setMessageCode(String messageCode) { + this.messageCode = messageCode; + } + + /** + * 获取模块编码 + * + * @return module_code - 模块编码 + */ + public Integer getModuleCode() { + return moduleCode; + } + + /** + * 设置模块编码 + * + * @param moduleCode 模块编码 + */ + public void setModuleCode(Integer moduleCode) { + this.moduleCode = moduleCode; + } + + /** + * 获取事项类型 + * + * @return matter_type - 事项类型 + */ + public Integer getMatterType() { + return matterType; + } + + /** + * 设置事项类型 + * + * @param matterType 事项类型 + */ + public void setMatterType(Integer matterType) { + this.matterType = matterType; + } + + /** + * 获取消息标题 + * + * @return message_title - 消息标题 + */ + public String getMessageTitle() { + return messageTitle; + } + + /** + * 设置消息标题 + * + * @param messageTitle 消息标题 + */ + public void setMessageTitle(String messageTitle) { + this.messageTitle = messageTitle; + } + + /** + * 获取系统来源 + * + * @return system_source - 系统来源 + */ + public String getSystemSource() { + return systemSource; + } + + /** + * 设置系统来源 + * + * @param systemSource 系统来源 + */ + public void setSystemSource(String systemSource) { + this.systemSource = systemSource; + } + + /** + * 获取处理类型(1:仅阅读 2:需要处理) + * + * @return process_type - 处理类型(1:仅阅读 2:需要处理) + */ + public Integer getProcessType() { + return processType; + } + + /** + * 设置处理类型(1:仅阅读 2:需要处理) + * + * @param processType 处理类型(1:仅阅读 2:需要处理) + */ + public void setProcessType(Integer processType) { + this.processType = processType; + } + + /** + * 获取提醒类型(1:持续提醒 2:阶段提醒 ) + * + * @return remind_type - 提醒类型(1:持续提醒 2:阶段提醒 ) + */ + public Integer getRemindType() { + return remindType; + } + + /** + * 设置提醒类型(1:持续提醒 2:阶段提醒 ) + * + * @param remindType 提醒类型(1:持续提醒 2:阶段提醒 ) + */ + public void setRemindType(Integer remindType) { + this.remindType = remindType; + } + + /** + * 获取提醒时间段 开始时间 + * + * @return remind_start_time - 提醒时间段 开始时间 + */ + public Date getRemindStartTime() { + return remindStartTime; + } + + /** + * 设置提醒时间段 开始时间 + * + * @param remindStartTime 提醒时间段 开始时间 + */ + public void setRemindStartTime(Date remindStartTime) { + this.remindStartTime = remindStartTime; + } + + /** + * 获取提醒时间段 结束时间 + * + * @return remind_end_time - 提醒时间段 结束时间 + */ + public Date getRemindEndTime() { + return remindEndTime; + } + + /** + * 设置提醒时间段 结束时间 + * + * @param remindEndTime 提醒时间段 结束时间 + */ + public void setRemindEndTime(Date remindEndTime) { + this.remindEndTime = remindEndTime; + } + + /** + * 获取截止日期 + * + * @return deadline - 截止日期 + */ + public Date getDeadline() { + return deadline; + } + + /** + * 设置截止日期 + * + * @param deadline 截止日期 + */ + public void setDeadline(Date deadline) { + this.deadline = deadline; + } + + /** + * 获取今日必办标识(0:否 1:是) + * + * @return today_task - 今日必办标识(0:否 1:是) + */ + public Boolean getTodayTask() { + return todayTask; + } + + /** + * 设置今日必办标识(0:否 1:是) + * + * @param todayTask 今日必办标识(0:否 1:是) + */ + public void setTodayTask(Boolean todayTask) { + this.todayTask = todayTask; + } + + /** + * 获取消息图片URL + * + * @return message_image - 消息图片URL + */ + public String getMessageImage() { + return messageImage; + } + + /** + * 设置消息图片URL + * + * @param messageImage 消息图片URL + */ + public void setMessageImage(String messageImage) { + this.messageImage = messageImage; + } + + /** + * 获取发布状态(0:未发布 1:已发布 2:已撤销) + * + * @return publish_status - 发布状态(0:未发布 1:已发布 2:已撤销) + */ + public Boolean getPublishStatus() { + return publishStatus; + } + + /** + * 设置发布状态(0:未发布 1:已发布 2:已撤销) + * + * @param publishStatus 发布状态(0:未发布 1:已发布 2:已撤销) + */ + public void setPublishStatus(Boolean publishStatus) { + this.publishStatus = publishStatus; + } + + /** + * 获取发布时间 + * + * @return publish_time - 发布时间 + */ + public Date getPublishTime() { + return publishTime; + } + + /** + * 设置发布时间 + * + * @param publishTime 发布时间 + */ + public void setPublishTime(Date publishTime) { + this.publishTime = publishTime; + } + + /** + * 获取发布人ID + * + * @return publisher_user_id - 发布人ID + */ + public Long getPublisherUserId() { + return publisherUserId; + } + + /** + * 设置发布人ID + * + * @param publisherUserId 发布人ID + */ + public void setPublisherUserId(Long publisherUserId) { + this.publisherUserId = publisherUserId; + } + + /** + * 获取创建人ID + * + * @return create_user_id - 创建人ID + */ + public Long getCreateUserId() { + return createUserId; + } + + /** + * 设置创建人ID + * + * @param createUserId 创建人ID + */ + public void setCreateUserId(Long createUserId) { + this.createUserId = createUserId; + } + + /** + * 获取创建时间 + * + * @return create_time - 创建时间 + */ + public Date getCreateTime() { + return createTime; + } + + /** + * 设置创建时间 + * + * @param createTime 创建时间 + */ + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + /** + * 获取更新人ID + * + * @return updater_user_id - 更新人ID + */ + public Long getUpdaterUserId() { + return updaterUserId; + } + + /** + * 设置更新人ID + * + * @param updaterUserId 更新人ID + */ + public void setUpdaterUserId(Long updaterUserId) { + this.updaterUserId = updaterUserId; + } + + /** + * 获取更新时间 + * + * @return update_time - 更新时间 + */ + public Date getUpdateTime() { + return updateTime; + } + + /** + * 设置更新时间 + * + * @param updateTime 更新时间 + */ + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + /** + * 获取删除标记(0:未删除 1:已删除) + * + * @return deleted - 删除标记(0:未删除 1:已删除) + */ + public Boolean getDeleted() { + return deleted; + } + + /** + * 设置删除标记(0:未删除 1:已删除) + * + * @param deleted 删除标记(0:未删除 1:已删除) + */ + public void setDeleted(Boolean deleted) { + this.deleted = deleted; + } + + /** + * 获取消息详情(富文本内容) + * + * @return message_content - 消息详情(富文本内容) + */ + public String getMessageContent() { + return messageContent; + } + + /** + * 设置消息详情(富文本内容) + * + * @param messageContent 消息详情(富文本内容) + */ + public void setMessageContent(String messageContent) { + this.messageContent = messageContent; + } + + /** + * 获取处理人信息 [{type:person,value:}{type:position,value:}] + * + * @return handle_person_info - 处理人信息 [{type:person,value:}{type:position,value:}] + */ + public String getHandlePersonInfo() { + return handlePersonInfo; + } + + /** + * 设置处理人信息 [{type:person,value:}{type:position,value:}] + * + * @param handlePersonInfo 处理人信息 [{type:person,value:}{type:position,value:}] + */ + public void setHandlePersonInfo(String handlePersonInfo) { + this.handlePersonInfo = handlePersonInfo; + } + + /** + * 获取门店范围 [{type:store,value:}{type:region,value:}] + * + * @return store_info - 门店范围 [{type:store,value:}{type:region,value:}] + */ + public String getStoreInfo() { + return storeInfo; + } + + /** + * 设置门店范围 [{type:store,value:}{type:region,value:}] + * + * @param storeInfo 门店范围 [{type:store,value:}{type:region,value:}] + */ + public void setStoreInfo(String storeInfo) { + this.storeInfo = storeInfo; + } +} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/StoreMessageDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/StoreMessageDO.java new file mode 100644 index 000000000..852fbedbf --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/StoreMessageDO.java @@ -0,0 +1,440 @@ +package com.cool.store.entity; + +import java.util.Date; +import javax.persistence.*; + +@Table(name = "zxjp_store_message") +public class StoreMessageDO { + /** + * 主键ID + */ + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + /** + * 门店编码 + */ + @Column(name = "store_id") + private String storeId; + + /** + * 门店编码 + */ + @Column(name = "store_code") + private String storeCode; + + /** + * 门店名称 + */ + @Column(name = "store_name") + private String storeName; + + /** + * 关联的消息模板ID + */ + @Column(name = "message_template_id") + private Long messageTemplateId; + + /** + * 阅读状态(0:未读 1:已读) + */ + @Column(name = "read_status") + private Boolean readStatus; + + /** + * 阅读时间 + */ + @Column(name = "read_time") + private Date readTime; + + /** + * 处理状态(0:未处理 1:处理中) + */ + @Column(name = "process_status") + private Integer processStatus; + + /** + * 处理时间 + */ + @Column(name = "process_time") + private Date processTime; + + /** + * 实际操作人ID + */ + @Column(name = "actual_operator_id") + private Long actualOperatorId; + + /** + * 实际操作人姓名 + */ + @Column(name = "actual_operator_name") + private String actualOperatorName; + + /** + * 撤销状态(0:未撤销 1:已撤销) + */ + @Column(name = "revoke_status") + private Boolean revokeStatus; + + /** + * 撤销时间 + */ + @Column(name = "revoke_time") + private Date revokeTime; + + /** + * 撤销操作人ID + */ + @Column(name = "revoke_operator_id") + private Long revokeOperatorId; + + /** + * 撤销操作人姓名 + */ + @Column(name = "revoke_operator_name") + private String revokeOperatorName; + + /** + * 创建时间 + */ + @Column(name = "create_time") + private Date createTime; + + /** + * 更新时间 + */ + @Column(name = "update_time") + private Date updateTime; + + /** + * 操作人列表 逗号隔开 + */ + @Column(name = "operator_list") + private String operatorList; + + /** + * 获取主键ID + * + * @return id - 主键ID + */ + public Long getId() { + return id; + } + + /** + * 设置主键ID + * + * @param id 主键ID + */ + public void setId(Long id) { + this.id = id; + } + + /** + * 获取门店编码 + * + * @return store_id - 门店编码 + */ + public String getStoreId() { + return storeId; + } + + /** + * 设置门店编码 + * + * @param storeId 门店编码 + */ + public void setStoreId(String storeId) { + this.storeId = storeId; + } + + /** + * 获取门店编码 + * + * @return store_code - 门店编码 + */ + public String getStoreCode() { + return storeCode; + } + + /** + * 设置门店编码 + * + * @param storeCode 门店编码 + */ + public void setStoreCode(String storeCode) { + this.storeCode = storeCode; + } + + /** + * 获取门店名称 + * + * @return store_name - 门店名称 + */ + public String getStoreName() { + return storeName; + } + + /** + * 设置门店名称 + * + * @param storeName 门店名称 + */ + public void setStoreName(String storeName) { + this.storeName = storeName; + } + + /** + * 获取关联的消息模板ID + * + * @return message_template_id - 关联的消息模板ID + */ + public Long getMessageTemplateId() { + return messageTemplateId; + } + + /** + * 设置关联的消息模板ID + * + * @param messageTemplateId 关联的消息模板ID + */ + public void setMessageTemplateId(Long messageTemplateId) { + this.messageTemplateId = messageTemplateId; + } + + /** + * 获取阅读状态(0:未读 1:已读) + * + * @return read_status - 阅读状态(0:未读 1:已读) + */ + public Boolean getReadStatus() { + return readStatus; + } + + /** + * 设置阅读状态(0:未读 1:已读) + * + * @param readStatus 阅读状态(0:未读 1:已读) + */ + public void setReadStatus(Boolean readStatus) { + this.readStatus = readStatus; + } + + /** + * 获取阅读时间 + * + * @return read_time - 阅读时间 + */ + public Date getReadTime() { + return readTime; + } + + /** + * 设置阅读时间 + * + * @param readTime 阅读时间 + */ + public void setReadTime(Date readTime) { + this.readTime = readTime; + } + + /** + * 获取处理状态(0:未处理 1:处理中) + * + * @return process_status - 处理状态(0:未处理 1:处理中) + */ + public Integer getProcessStatus() { + return processStatus; + } + + /** + * 设置处理状态(0:未处理 1:处理中) + * + * @param processStatus 处理状态(0:未处理 1:处理中) + */ + public void setProcessStatus(Integer processStatus) { + this.processStatus = processStatus; + } + + /** + * 获取处理时间 + * + * @return process_time - 处理时间 + */ + public Date getProcessTime() { + return processTime; + } + + /** + * 设置处理时间 + * + * @param processTime 处理时间 + */ + public void setProcessTime(Date processTime) { + this.processTime = processTime; + } + + /** + * 获取实际操作人ID + * + * @return actual_operator_id - 实际操作人ID + */ + public Long getActualOperatorId() { + return actualOperatorId; + } + + /** + * 设置实际操作人ID + * + * @param actualOperatorId 实际操作人ID + */ + public void setActualOperatorId(Long actualOperatorId) { + this.actualOperatorId = actualOperatorId; + } + + /** + * 获取实际操作人姓名 + * + * @return actual_operator_name - 实际操作人姓名 + */ + public String getActualOperatorName() { + return actualOperatorName; + } + + /** + * 设置实际操作人姓名 + * + * @param actualOperatorName 实际操作人姓名 + */ + public void setActualOperatorName(String actualOperatorName) { + this.actualOperatorName = actualOperatorName; + } + + /** + * 获取撤销状态(0:未撤销 1:已撤销) + * + * @return revoke_status - 撤销状态(0:未撤销 1:已撤销) + */ + public Boolean getRevokeStatus() { + return revokeStatus; + } + + /** + * 设置撤销状态(0:未撤销 1:已撤销) + * + * @param revokeStatus 撤销状态(0:未撤销 1:已撤销) + */ + public void setRevokeStatus(Boolean revokeStatus) { + this.revokeStatus = revokeStatus; + } + + /** + * 获取撤销时间 + * + * @return revoke_time - 撤销时间 + */ + public Date getRevokeTime() { + return revokeTime; + } + + /** + * 设置撤销时间 + * + * @param revokeTime 撤销时间 + */ + public void setRevokeTime(Date revokeTime) { + this.revokeTime = revokeTime; + } + + /** + * 获取撤销操作人ID + * + * @return revoke_operator_id - 撤销操作人ID + */ + public Long getRevokeOperatorId() { + return revokeOperatorId; + } + + /** + * 设置撤销操作人ID + * + * @param revokeOperatorId 撤销操作人ID + */ + public void setRevokeOperatorId(Long revokeOperatorId) { + this.revokeOperatorId = revokeOperatorId; + } + + /** + * 获取撤销操作人姓名 + * + * @return revoke_operator_name - 撤销操作人姓名 + */ + public String getRevokeOperatorName() { + return revokeOperatorName; + } + + /** + * 设置撤销操作人姓名 + * + * @param revokeOperatorName 撤销操作人姓名 + */ + public void setRevokeOperatorName(String revokeOperatorName) { + this.revokeOperatorName = revokeOperatorName; + } + + /** + * 获取创建时间 + * + * @return create_time - 创建时间 + */ + public Date getCreateTime() { + return createTime; + } + + /** + * 设置创建时间 + * + * @param createTime 创建时间 + */ + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + /** + * 获取更新时间 + * + * @return update_time - 更新时间 + */ + public Date getUpdateTime() { + return updateTime; + } + + /** + * 设置更新时间 + * + * @param updateTime 更新时间 + */ + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + /** + * 获取操作人列表 逗号隔开 + * + * @return operator_list - 操作人列表 逗号隔开 + */ + public String getOperatorList() { + return operatorList; + } + + /** + * 设置操作人列表 逗号隔开 + * + * @param operatorList 操作人列表 逗号隔开 + */ + public void setOperatorList(String operatorList) { + this.operatorList = operatorList; + } +} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/notice/MatterConfigAddRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/notice/MatterConfigAddRequest.java new file mode 100644 index 000000000..788ff839a --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/notice/MatterConfigAddRequest.java @@ -0,0 +1,49 @@ +package com.cool.store.request.notice; + +import com.aliyun.teautil.Common; +import com.cool.store.dto.notice.CommonDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2025/7/24 15:23 + * @Version 1.0 + */ +@Data +public class MatterConfigAddRequest { + + @ApiModelProperty( "Id 新增忽略") + private Long id; + + @ApiModelProperty( "模块CODE") + private Integer moduleCode; + + @ApiModelProperty( "事项类型") + private Integer matterType; + + @ApiModelProperty( "系统来源") + private String systemSource; + + @ApiModelProperty( "1:H5 2:小程序") + private Boolean jumpType; + + @ApiModelProperty( "跳转链接") + private String jumpUrl; + + @ApiModelProperty( "状态(0:禁用 1:启用)") + private Boolean status; + + @ApiModelProperty( "备注") + private String remark; + + @ApiModelProperty( "默认门店范围 type[region store group]") + List storeInfoList; + + @ApiModelProperty( "默认处理人信息 type[person position userGroup organization]") + List userInfoList; + + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/notice/MatterConfigDeletedRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/notice/MatterConfigDeletedRequest.java new file mode 100644 index 000000000..a8ede4262 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/notice/MatterConfigDeletedRequest.java @@ -0,0 +1,18 @@ +package com.cool.store.request.notice; + +import lombok.Data; + +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2025/7/24 16:47 + * @Version 1.0 + */ +@Data +public class MatterConfigDeletedRequest { + + private List ids; + + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/notice/MatterConfigQueryRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/notice/MatterConfigQueryRequest.java new file mode 100644 index 000000000..751e6b7e3 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/notice/MatterConfigQueryRequest.java @@ -0,0 +1,22 @@ +package com.cool.store.request.notice; + +import com.cool.store.common.PageBasicInfo; +import lombok.Data; + +/** + * @Author suzhuhong + * @Date 2025/7/24 14:36 + * @Version 1.0 + */ +@Data +public class MatterConfigQueryRequest extends PageBasicInfo { + + private Integer moduleCode; + + private Integer matterType; + + private String systemSource; + + private Integer status; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/notice/MatterAndMatterDetailVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/notice/MatterAndMatterDetailVO.java new file mode 100644 index 000000000..fdf5e8cfd --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/notice/MatterAndMatterDetailVO.java @@ -0,0 +1,44 @@ +package com.cool.store.vo.notice; + +import com.cool.store.dto.notice.CommonDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2025/7/24 16:50 + * @Version 1.0 + */ +@Data +public class MatterAndMatterDetailVO { + + @ApiModelProperty( "模块CODE") + private Integer moduleCode; + + @ApiModelProperty( "事项类型") + private Integer matterType; + + @ApiModelProperty( "系统来源") + private String systemSource; + + @ApiModelProperty( "1:H5 2:小程序") + private Boolean jumpType; + + @ApiModelProperty( "跳转链接") + private String jumpUrl; + + @ApiModelProperty( "状态(0:禁用 1:启用)") + private Boolean status; + + @ApiModelProperty( "备注") + private String remark; + + @ApiModelProperty( "默认门店范围 type[region store group]") + List storeInfoList; + + @ApiModelProperty( "默认处理人信息 type[person position userGroup organization]") + List userInfoList; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/notice/ModuleAndMatterVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/notice/ModuleAndMatterVO.java new file mode 100644 index 000000000..d924c1492 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/notice/ModuleAndMatterVO.java @@ -0,0 +1,59 @@ +package com.cool.store.vo.notice; + +import com.cool.store.enums.notice.MatterTypeEnum; +import com.cool.store.enums.notice.ModuleCodeEnum; +import lombok.Data; + +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +/** + * @Author suzhuhong + * @Date 2025/7/24 16:26 + * @Version 1.0 + */ +@Data +public class ModuleAndMatterVO { + + private Integer moduleCode; + + private String moduleName; + + private List matterTypeList; + + public ModuleAndMatterVO(Integer moduleCode, String moduleName, List matterTypeList) { + this.moduleCode = moduleCode; + this.moduleName = moduleName; + this.matterTypeList = matterTypeList; + } + + @Data + static class MatterTypeVO{ + private Integer matterTypeCode; + private String matterTypeName; + public MatterTypeVO(Integer matterTypeCode, String matterTypeName) { + this.matterTypeCode = matterTypeCode; + this.matterTypeName = matterTypeName; + } + } + + public static List getModuleAndMatterList() { + return Arrays.stream(ModuleCodeEnum.values()) + .map(module -> new ModuleAndMatterVO( + module.getCode(), + module.getMessage(), + convertMatterTypes(module.getMatterTypeEnums()) + )) + .collect(Collectors.toList()); + } + + private static List convertMatterTypes(List matterTypeEnums) { + return matterTypeEnums.stream() + .map(matterType -> new MatterTypeVO( + matterType.getCode(), + matterType.getMessage() + )) + .collect(Collectors.toList()); + } +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/MatterConfigService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/MatterConfigService.java new file mode 100644 index 000000000..9072e7e0c --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/MatterConfigService.java @@ -0,0 +1,57 @@ +package com.cool.store.service; + + +import com.cool.store.context.LoginUserInfo; +import com.cool.store.dao.MatterConfigDAO; +import com.cool.store.entity.MatterConfigDO; +import com.cool.store.request.notice.MatterConfigAddRequest; +import com.cool.store.request.notice.MatterConfigQueryRequest; +import com.cool.store.userholder.CurrentUser; +import com.cool.store.vo.notice.MatterAndMatterDetailVO; +import com.github.pagehelper.PageInfo; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2025/7/24 15:21 + * @Version 1.0 + */ +public interface MatterConfigService { + + + /** + * 新增配置 + * @param request + * @param currentUser + * @return + */ + int addMatterConfig(MatterConfigAddRequest request, LoginUserInfo currentUser); + + /** + * 编辑 + * @param request + * @param currentUser + * @return + */ + int editMatterConfig(MatterConfigAddRequest request, LoginUserInfo currentUser); + + /** + * 删除配置 + * @param ids + * @param currentUser + * @return + */ + Boolean deleteMatterConfig(List ids, LoginUserInfo currentUser); + + + /** + * 查询配置 + * @param request + * @return + */ + PageInfo listByCondition(MatterConfigQueryRequest request); + + +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MatterConfigServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MatterConfigServiceImpl.java new file mode 100644 index 000000000..4875e39fe --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MatterConfigServiceImpl.java @@ -0,0 +1,83 @@ +package com.cool.store.service.impl; + +import com.alibaba.fastjson.JSONObject; +import com.cool.store.context.LoginUserInfo; +import com.cool.store.dao.MatterConfigDAO; +import com.cool.store.dto.notice.CommonDTO; +import com.cool.store.entity.MatterConfigDO; +import com.cool.store.request.notice.MatterConfigAddRequest; +import com.cool.store.request.notice.MatterConfigQueryRequest; +import com.cool.store.service.MatterConfigService; +import com.cool.store.vo.notice.MatterAndMatterDetailVO; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2025/7/24 16:41 + * @Version 1.0 + */ +@Service +public class MatterConfigServiceImpl implements MatterConfigService { + + @Resource + MatterConfigDAO matterConfigDAO; + + @Override + public int addMatterConfig(MatterConfigAddRequest request, LoginUserInfo currentUser) { + MatterConfigDO matterConfigDO = new MatterConfigDO(); + BeanUtils.copyProperties(request, matterConfigDO); + matterConfigDO.setCreateUserId(currentUser.getUserId()); + matterConfigDO.setDefaultStoreInfo(JSONObject.toJSONString(request.getStoreInfoList())); + matterConfigDO.setDefaultHandlePersonInfo(JSONObject.toJSONString(request.getUserInfoList())); + return matterConfigDAO.insert(matterConfigDO); + } + + @Override + public int editMatterConfig(MatterConfigAddRequest request, LoginUserInfo currentUser) { + MatterConfigDO matterConfigDO = new MatterConfigDO(); + BeanUtils.copyProperties(request, matterConfigDO); + matterConfigDO.setUpdateUserId(currentUser.getUserId()); + matterConfigDO.setUpdateTime(new Date()); + matterConfigDO.setDefaultStoreInfo(JSONObject.toJSONString(request.getStoreInfoList())); + matterConfigDO.setDefaultHandlePersonInfo(JSONObject.toJSONString(request.getUserInfoList())); + return matterConfigDAO.updateForce(matterConfigDO); + } + + @Override + public Boolean deleteMatterConfig(List ids, LoginUserInfo currentUser) { + matterConfigDAO.batchDelete(ids,currentUser.getUserId()); + return Boolean.TRUE; + } + + @Override + public PageInfo listByCondition(MatterConfigQueryRequest request) { + PageHelper.startPage(request.getPageNum(), request.getPageSize()); + List matterConfigDOS = matterConfigDAO.ListByCondition(request); + + if (CollectionUtils.isEmpty(matterConfigDOS)){ + return new PageInfo<>(); + } + PageInfo result = new PageInfo<>(matterConfigDOS); + List list = new ArrayList<>(); + matterConfigDOS.forEach(x->{ + MatterAndMatterDetailVO matterAndMatterDetailVO = new MatterAndMatterDetailVO(); + BeanUtils.copyProperties(x,matterAndMatterDetailVO); + matterAndMatterDetailVO.setStoreInfoList(JSONObject.parseArray(x.getDefaultStoreInfo(), CommonDTO.class)); + matterAndMatterDetailVO.setUserInfoList(JSONObject.parseArray(x.getDefaultHandlePersonInfo(),CommonDTO.class)); + list.add(matterAndMatterDetailVO); + }); + result.setList(list); + return result; + } + + +} diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/CommonEnumController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/CommonEnumController.java new file mode 100644 index 000000000..48416a59a --- /dev/null +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/CommonEnumController.java @@ -0,0 +1,39 @@ +package com.cool.store.controller.webb; + +import com.cool.store.response.ResponseResult; +import com.cool.store.vo.notice.ModuleAndMatterVO; +import com.cool.store.vo.shop.ShopStageVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2025/7/24 16:19 + * @Version 1.0 + */ +@RestController +@RequestMapping("/pc/udc") +@Api(tags = "PC枚举值") +@Slf4j +public class CommonEnumController { + + + @ApiOperation("获取模块与消息类型") + @GetMapping("/getModuleAndMatter") + public ResponseResult> getShopSubStageStatusEnum() { + return ResponseResult.success(ModuleAndMatterVO.getModuleAndMatterList()); + } + + + + + + + +} diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/MatterConfigController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/MatterConfigController.java new file mode 100644 index 000000000..a66c43e0e --- /dev/null +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/MatterConfigController.java @@ -0,0 +1,65 @@ +package com.cool.store.controller.webb; + +import com.cool.store.context.CurrentUserHolder; +import com.cool.store.request.notice.MatterConfigAddRequest; +import com.cool.store.request.notice.MatterConfigDeletedRequest; +import com.cool.store.request.notice.MatterConfigQueryRequest; +import com.cool.store.service.MatterConfigService; +import com.cool.store.userholder.CurrentUser; +import com.cool.store.vo.notice.MatterAndMatterDetailVO; +import com.github.pagehelper.PageInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * @Author suzhuhong + * @Date 2025/7/24 16:40 + * @Version 1.0 + */ +@RestController +@RequestMapping("/pc/matter/config") +@Api(tags = "PC事项配置") +@Slf4j +public class MatterConfigController { + + @Resource + MatterConfigService matterConfigService; + + @PostMapping("/add") + @ApiOperation("新增事项配置") + public int addMatterConfig(@RequestBody MatterConfigAddRequest request) { + return matterConfigService.addMatterConfig(request, CurrentUserHolder.getUser()); + } + + @PostMapping("/edit") + @ApiOperation("编辑事项配置") + public int editMatterConfig(@RequestBody MatterConfigAddRequest request) { + return matterConfigService.editMatterConfig(request, CurrentUserHolder.getUser()); + } + + + @PostMapping("/deleteMatterConfig") + @ApiOperation("批量删除事项配置") + public Boolean addMatterConfig(@RequestBody MatterConfigDeletedRequest request) { + return matterConfigService.deleteMatterConfig(request.getIds(), CurrentUserHolder.getUser()); + } + + @PostMapping("/list") + @ApiOperation("事项配置列表") + public PageInfo listByCondition(@RequestBody MatterConfigQueryRequest request) { + return matterConfigService.listByCondition(request); + } + + + + + +}