From d5b1960996a65b2f6c15629e13c0b320e5ea255e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 27 Aug 2025 11:24:00 +0800 Subject: [PATCH 01/19] =?UTF-8?q?feat:=E9=80=9A=E7=9F=A5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/enums/ErrorCodeEnum.java | 1 + .../store/enums/notice/MatterTypeEnum.java | 4 + .../store/enums/notice/ModuleCodeEnum.java | 9 +- .../cool/store/enums/notice/SceneEnum.java | 85 +++++++++++++++++ .../com/cool/store/dao/EnterpriseUserDAO.java | 7 ++ .../store/mapper/EnterpriseUserMapper.java | 2 + .../resources/mapper/EnterpriseUserMapper.xml | 15 +++ .../cool/store/entity/MessageTemplateDO.java | 5 + .../request/notice/ThirdMatterRequest.java | 61 ++++++++++++ .../store/service/MessageTemplateService.java | 11 ++- .../impl/MessageTemplateServiceImpl.java | 95 +++++++++++++++++-- .../webb/MessageTemplateController.java | 2 +- .../controller/webb/OpenApiController.java | 11 +++ 13 files changed, 296 insertions(+), 12 deletions(-) create mode 100644 coolstore-partner-common/src/main/java/com/cool/store/enums/notice/SceneEnum.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/request/notice/ThirdMatterRequest.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 ae56b9f3a..7da54e599 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 @@ -298,6 +298,7 @@ public enum ErrorCodeEnum { MESSAGE_TEMPLATE_NOT_SUPPORT_DELETED(1610002,"只有未发布的消息能删除，请确认！",null), STORE_MESSAGE_REVOKE(1610003,"当前门店消息已撤销，请务重复操作",null), STORE_MESSAGE_HANDLED(1610004,"当前门店消息已处理，无法撤销！",null), + MATTER_STORE_OR_USER_IS_NULL(1610005,"当前事项门店或者人员为空，发布失败，请确认！",null), ; 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 index 9d94dde40..bcc9697d8 100644 --- 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 @@ -10,6 +10,10 @@ public enum MatterTypeEnum { QUESTION(0,"门店违规工单"), LICENSE(1,"证照过期提醒"), NOTICE(2,"通知消息"), + LOGISTICS(3,"物流"), + SERVICE_PACKAGE(4,"服务包"), + RESTOCK(5,"补货"), + INVENTORY(6,"盘点"), ; MatterTypeEnum(Integer code, String 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 index 22b696bcf..3bfa89f8a 100644 --- 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 @@ -10,10 +10,13 @@ import java.util.List; */ public enum ModuleCodeEnum { - STORE_WORK(0,"店务", Arrays.asList(MatterTypeEnum.QUESTION,MatterTypeEnum.LICENSE,MatterTypeEnum.NOTICE)), - PRODUCT_UPDATE(1,"营销政策/产品上新",Arrays.asList(MatterTypeEnum.NOTICE)), - INVENTORY_MODULE(2,"库存模块",Arrays.asList(MatterTypeEnum.NOTICE)), + STORE_WORK(0,"店务日清/培训", Arrays.asList(MatterTypeEnum.QUESTION,MatterTypeEnum.LICENSE)), + PRODUCT_UPDATE(1,"营销政策/产品上新",Arrays.asList(MatterTypeEnum.SERVICE_PACKAGE)), + INVENTORY_MODULE(2,"原料订货与库存管理",Arrays.asList(MatterTypeEnum.RESTOCK,MatterTypeEnum.INVENTORY,MatterTypeEnum.LOGISTICS)), DISH(3,"菜品",Arrays.asList(MatterTypeEnum.NOTICE)), + FRANCHISE(4,"加盟",Arrays.asList(MatterTypeEnum.NOTICE)), + //其他（投诉与客户服务、临时通知） + OTHER(5,"其他",Arrays.asList(MatterTypeEnum.NOTICE)), ; ModuleCodeEnum(Integer code, String message,List matterTypeEnums) { diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/notice/SceneEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/notice/SceneEnum.java new file mode 100644 index 000000000..d5fc87540 --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/notice/SceneEnum.java @@ -0,0 +1,85 @@ +package com.cool.store.enums.notice; + +/** + * @Author suzhuhong + * @Date 2025/8/26 15:43 + * @Version 1.0 + */ +public enum SceneEnum { + + SUBMIT_ORDER(0, "提交订单", "https://oss-cool.coolstore.cn/eid/214ac5a3a517472a87268e02a2e6410a/2508/j_l6em.jpg", MatterTypeEnum.LOGISTICS), + ASSIGNED_PICKING(5, "已分配拣货", "https://oss-cool.coolstore.cn/eid/214ac5a3a517472a87268e02a2e6410a/2508/YLjBkv.jpg", MatterTypeEnum.LOGISTICS), + PICKING_COMPLETED(10, "拣货完成", "https://oss-cool.coolstore.cn/eid/214ac5a3a517472a87268e02a2e6410a/2508/gG9Y-h.jpg", MatterTypeEnum.LOGISTICS), + SHIPPED(15, "已出库", "https://oss-cool.coolstore.cn/eid/214ac5a3a517472a87268e02a2e6410a/2508/Ehz8_n.jpg", MatterTypeEnum.LOGISTICS), + DELIVERY_IN_PROGRESS(20, "配送中", "https://oss-cool.coolstore.cn/eid/214ac5a3a517472a87268e02a2e6410a/2508/I6bAmA.jpg", MatterTypeEnum.LOGISTICS), + ORDER_SIGNING_AND_ACCEPTANCE(25, "订单签收", "https://oss-cool.coolstore.cn/eid/214ac5a3a517472a87268e02a2e6410a/2508/0z7jkU.jpg", MatterTypeEnum.LOGISTICS), + + SERVICE_PACKAGE(30, "服务包", "", MatterTypeEnum.LOGISTICS), + RESTOCK(35, "补货", "", MatterTypeEnum.LOGISTICS), + INVENTORY(40, "盘点", "", MatterTypeEnum.LOGISTICS), + + ; + + private Integer sceneCode; + + private String sceneName; + + private String scenePicture; + + private MatterTypeEnum matterTypeEnum; + + + public Integer getSceneCode() { + return sceneCode; + } + + public void setSceneCode(Integer sceneCode) { + this.sceneCode = sceneCode; + } + + public String getSceneName() { + return sceneName; + } + + public void setSceneName(String sceneName) { + this.sceneName = sceneName; + } + + public String getScenePicture() { + return scenePicture; + } + + public void setScenePicture(String scenePicture) { + this.scenePicture = scenePicture; + } + + public MatterTypeEnum getMatterTypeEnum() { + return matterTypeEnum; + } + + public void setMatterTypeEnum(MatterTypeEnum matterTypeEnum) { + this.matterTypeEnum = matterTypeEnum; + } + + SceneEnum(Integer sceneCode, String sceneName, String scenePicture, MatterTypeEnum matterTypeEnum) { + this.sceneCode = sceneCode; + this.sceneName = sceneName; + this.scenePicture = scenePicture; + this.matterTypeEnum = matterTypeEnum; + } + + /** + * 通过code获取枚举 + * @param code + * @return + */ + public static SceneEnum getByCode(Integer code) { + for (SceneEnum value : values()) { + if (value.sceneCode.equals(code)) { + return value; + } + } + return null; + } + +} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java index 90f9909a6..08d2edf1a 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java @@ -56,6 +56,13 @@ public class EnterpriseUserDAO { return enterpriseUserMapper.getUserInfoByUserIds(userIdList); } + public List getUserInfoByUserMobileList(List mobileList) { + if (CollectionUtils.isEmpty(mobileList)) { + return Lists.newArrayList(); + } + return enterpriseUserMapper.getUserInfoByUserMobileList(mobileList); + } + public List searchUserByRegionIdsAndKeyword(List regionIds, String keyword, List leaderRegionIds) { if (CollectionUtils.isEmpty(regionIds)) { return Lists.newArrayList(); diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java index 882a9f452..9a867adcb 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java @@ -32,6 +32,8 @@ public interface EnterpriseUserMapper { */ List getUserInfoByUserIds( @Param("userIdList") List userIdList); + List getUserInfoByUserMobileList( @Param("mobileList") List mobileList); + /** * 根据关键字搜索部门下的用户 * @param regionIds diff --git a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml index 33c3daa89..cacda592c 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml @@ -82,6 +82,21 @@ + + + SELECT + * + FROM zxjp_message_template + WHERE deleted = 0 + + AND handle_keyword = #{keyword,jdbcType=VARCHAR} + + + \ 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 index 7e61ec631..05b594ebf 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/StoreMessageMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/StoreMessageMapper.xml @@ -216,6 +216,24 @@ a.id = #{id} + + UPDATE zxjp_store_message + SET + process_status = 1, + process_time = NOW(), + read_status = 1, + read_time = NOW(), + update_time = NOW() + + + AND message_template_id = #{id} + + and store_code IN + + #{item} + + + 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 index 11f241c79..578191ad3 100644 --- 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 @@ -156,5 +156,8 @@ public class MessageTemplateDO { @Column(name = "jump_url") private String jumpUrl; + @Column(name = "handle_keyword") + private String handleKeyword; + } \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/notice/ThirdHandleMessageRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/notice/ThirdHandleMessageRequest.java new file mode 100644 index 000000000..1ce35b465 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/notice/ThirdHandleMessageRequest.java @@ -0,0 +1,26 @@ +package com.cool.store.request.notice; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2025/8/29 11:10 + * @Version 1.0 + */ +@Data +public class ThirdHandleMessageRequest { + + @ApiModelProperty("发起任务时 传的handleKeyword") + @NotBlank(message = "handleKeyword不能为空") + private String handleKeyword; + + @ApiModelProperty("门店编码列表") + @NotNull(message = "门店编码列表不能为空") + private List shopCodeList; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/notice/ThirdMatterRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/notice/ThirdMatterRequest.java index 9b2838208..49e08d99e 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/notice/ThirdMatterRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/notice/ThirdMatterRequest.java @@ -60,4 +60,7 @@ public class ThirdMatterRequest { private String jumpUrl; + @ApiModelProperty("处理关键字 针对processType需要处理的字段 需要传递该关键字识别 注意 每个批次门店任务keyword不能重复") + private String handleKeyword; + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/MessageTemplateService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/MessageTemplateService.java index b0935f149..567103c82 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/MessageTemplateService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/MessageTemplateService.java @@ -102,4 +102,5 @@ public interface MessageTemplateService { Boolean handleMessage(Long id, PartnerUserInfoVO userInfoVO); + ApiResponse thirdHandleMessage(ThirdHandleMessageRequest 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 index 4875e39fe..ba7ccab95 100644 --- 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 @@ -36,8 +36,12 @@ public class MatterConfigServiceImpl implements MatterConfigService { MatterConfigDO matterConfigDO = new MatterConfigDO(); BeanUtils.copyProperties(request, matterConfigDO); matterConfigDO.setCreateUserId(currentUser.getUserId()); - matterConfigDO.setDefaultStoreInfo(JSONObject.toJSONString(request.getStoreInfoList())); - matterConfigDO.setDefaultHandlePersonInfo(JSONObject.toJSONString(request.getUserInfoList())); + if (CollectionUtils.isNotEmpty(request.getStoreInfoList())){ + matterConfigDO.setDefaultStoreInfo(JSONObject.toJSONString(request.getStoreInfoList())); + } + if (CollectionUtils.isNotEmpty(request.getUserInfoList())){ + matterConfigDO.setDefaultHandlePersonInfo(JSONObject.toJSONString(request.getUserInfoList())); + } return matterConfigDAO.insert(matterConfigDO); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java index 166ab7901..6fdad9655 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java @@ -186,6 +186,7 @@ public class MessageTemplateServiceImpl implements MessageTemplateService { @Override + @Transactional(rollbackFor = Exception.class) public ApiResponse thirdMatterHandle(ThirdMatterRequest thirdMatterRequest) { log.info("thirdMatterHandle request：{}", JSONObject.toJSONString(thirdMatterRequest)); //第三方事项处理 @@ -212,6 +213,7 @@ public class MessageTemplateServiceImpl implements MessageTemplateService { messageTemplateDO.setPublishStatus(PublishStatusEnum.UNPUBLISHED.getCode()); messageTemplateDO.setJumpType(matterConfig.getJumpType()); messageTemplateDO.setJumpUrl(matterConfig.getJumpUrl()); + messageTemplateDO.setHandleKeyword(thirdMatterRequest.getHandleKeyword()); if (MatterTypeEnum.LOGISTICS.getCode().equals(matterConfig.getMatterType())){ SceneEnum scene = SceneEnum.getByCode(thirdMatterRequest.getSceneCode()); @@ -449,6 +451,20 @@ public class MessageTemplateServiceImpl implements MessageTemplateService { return Boolean.TRUE; } + @Override + public ApiResponse thirdHandleMessage(ThirdHandleMessageRequest request) { + log.info("thirdHandleMessage request:{}", JSONObject.toJSONString(request)); + MessageTemplateDO message = messageTemplateDAO.getByKeyword(request.getHandleKeyword()); + if (message==null){ + return ApiResponse.error(ErrorCodeEnum.MESSAGE_NOT_EXIST); + } + if (!ProcessTypeEnum.HANDLE.equals(message.getProcessType())){ + return ApiResponse.error(ErrorCodeEnum.MESSAGE_NOT_HANDLED); + } + storeMessageDAO.batchUpdateHandle(message.getId(), request.getShopCodeList()); + return ApiResponse.success(Boolean.TRUE); + } + public Map> getAuthUser(List personInfo, List storeIds){ if (CollectionUtils.isEmpty(personInfo)){ diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java index 4682056cc..743c60ddb 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java @@ -1,11 +1,13 @@ package com.cool.store.controller.webb; import com.alibaba.fastjson.JSONObject; +import com.cool.store.context.PartnerUserHolder; import com.cool.store.dto.*; import com.cool.store.dto.store.StoreUserPositionDTO; import com.cool.store.request.OpenApiStoreRequest; import com.cool.store.request.StoreCodeDTO; import com.cool.store.request.*; +import com.cool.store.request.notice.ThirdHandleMessageRequest; import com.cool.store.request.notice.ThirdMatterRequest; import com.cool.store.request.xgj.FranchiseFeeCallBackRequest; import com.cool.store.request.xgj.ReceiptCallBackRequest; @@ -162,4 +164,9 @@ public class OpenApiController { } + @ApiOperation("确认已处理") + @GetMapping("/handleMessage") + public ApiResponse handleMessage(@RequestBody @Validated ThirdHandleMessageRequest request) { + return messageTemplateService.thirdHandleMessage(request); + } } From 6383823ecf04c112346ac863221422768158536f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Fri, 29 Aug 2025 14:49:18 +0800 Subject: [PATCH 09/19] feat:matterType --- .../com/cool/store/service/impl/MessageTemplateServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java index 6fdad9655..da1cdeb03 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java @@ -273,7 +273,7 @@ public class MessageTemplateServiceImpl implements MessageTemplateService { } return ApiResponse.success(Boolean.TRUE); } - return ApiResponse.error(ErrorCodeEnum.MATTER_STORE_OR_USER_IS_NULL); + return ApiResponse.success(Boolean.FALSE); } From 9af2de1023bf4306002e435c45da0531f3e3b26c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Fri, 29 Aug 2025 15:07:10 +0800 Subject: [PATCH 10/19] feat:handlePersonInfo --- .../src/main/resources/mapper/MessageTemplateMapper.xml | 4 +++- .../src/main/java/com/cool/store/dto/notice/NoticeDTO.java | 4 ++++ .../cool/store/service/impl/MessageTemplateServiceImpl.java | 5 +++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/MessageTemplateMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/MessageTemplateMapper.xml index ca6737295..da19e7a78 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/MessageTemplateMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/MessageTemplateMapper.xml @@ -75,7 +75,9 @@ publish_time as publishTime, publisher_user_id as publishUserId, create_user_id as createUserId, - create_time as createTime + create_time as createTime, + handle_person_info as handlePersonInfo, + store_info as storeInfo FROM zxjp_message_template WHERE deleted = 0 diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/notice/NoticeDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/notice/NoticeDTO.java index 76f35729e..6cfd8a3c6 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/notice/NoticeDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/notice/NoticeDTO.java @@ -75,4 +75,8 @@ public class NoticeDTO { @ApiModelProperty("发布人时间") private Date publishTime; + private String handlePersonInfo; + + private String storeInfo; + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java index da1cdeb03..172483ba1 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java @@ -258,6 +258,11 @@ public class MessageTemplateServiceImpl implements MessageTemplateService { publishFlag = Boolean.FALSE; } messageTemplateDO.setCreateUserId("system"); + if (!publishFlag){ + //如果不发布 保存门店人员信息 + messageTemplateDO.setStoreInfo(storeInfo); + messageTemplateDO.setHandlePersonInfo(userInfo); + } messageTemplateDAO.insert(messageTemplateDO); //调用发布 if (publishFlag){ From 78cebf90d670c2e769bc26f34a8ecce2d1fc55b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Fri, 29 Aug 2025 16:02:11 +0800 Subject: [PATCH 11/19] feat:handlePersonInfo --- .../com/cool/store/service/impl/MessageTemplateServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java index 172483ba1..c27e0553b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java @@ -278,7 +278,7 @@ public class MessageTemplateServiceImpl implements MessageTemplateService { } return ApiResponse.success(Boolean.TRUE); } - return ApiResponse.success(Boolean.FALSE); + return ApiResponse.success(Boolean.TRUE); } From 231524eeb04207f2605bdc02856755787036513e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Mon, 1 Sep 2025 09:27:17 +0800 Subject: [PATCH 12/19] feat:editMatterConfig --- .../com/cool/store/service/impl/MatterConfigServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) 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 index ba7ccab95..1dbc6b7d6 100644 --- 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 @@ -5,6 +5,8 @@ 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.enums.ErrorCodeEnum; +import com.cool.store.exception.ServiceException; import com.cool.store.request.notice.MatterConfigAddRequest; import com.cool.store.request.notice.MatterConfigQueryRequest; import com.cool.store.service.MatterConfigService; @@ -47,6 +49,9 @@ public class MatterConfigServiceImpl implements MatterConfigService { @Override public int editMatterConfig(MatterConfigAddRequest request, LoginUserInfo currentUser) { + if (request.getId() == null){ + throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); + } MatterConfigDO matterConfigDO = new MatterConfigDO(); BeanUtils.copyProperties(request, matterConfigDO); matterConfigDO.setUpdateUserId(currentUser.getUserId()); From 88ac3bae11be761031e545addf53b067d2c8593e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Mon, 1 Sep 2025 11:26:45 +0800 Subject: [PATCH 13/19] feat:editMatterConfig --- .../com/cool/store/request/notice/MatterConfigAddRequest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 788ff839a..b38290376 100644 --- 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 @@ -34,7 +34,7 @@ public class MatterConfigAddRequest { private String jumpUrl; @ApiModelProperty( "状态(0:禁用 1:启用)") - private Boolean status; + private Integer status; @ApiModelProperty( "备注") private String remark; From 56f5d821ca6b52feb7697bf59382fa331b8e5af4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Mon, 1 Sep 2025 13:19:28 +0800 Subject: [PATCH 14/19] feat:editMatterConfig --- .../com/cool/store/request/notice/MatterConfigAddRequest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index b38290376..74c2d05b8 100644 --- 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 @@ -28,7 +28,7 @@ public class MatterConfigAddRequest { private String systemSource; @ApiModelProperty( "1:H5 2:小程序") - private Boolean jumpType; + private Integer jumpType; @ApiModelProperty( "跳转链接") private String jumpUrl; From f90feb407d80d595ec5fdabf3bdbdd0f5488505f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Mon, 1 Sep 2025 13:20:39 +0800 Subject: [PATCH 15/19] feat:editMatterConfig --- .../java/com/cool/store/controller/webb/OpenApiController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java index 743c60ddb..b5ce88f6b 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java @@ -165,7 +165,7 @@ public class OpenApiController { @ApiOperation("确认已处理") - @GetMapping("/handleMessage") + @PostMapping("/handleMessage") public ApiResponse handleMessage(@RequestBody @Validated ThirdHandleMessageRequest request) { return messageTemplateService.thirdHandleMessage(request); } From 5d1f424d5b0d35406cce4ebc487b950916b9c695 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 3 Sep 2025 14:49:31 +0800 Subject: [PATCH 16/19] feat:thirdHandleMessage --- .../com/cool/store/service/impl/MessageTemplateServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java index c27e0553b..983812b92 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java @@ -463,7 +463,7 @@ public class MessageTemplateServiceImpl implements MessageTemplateService { if (message==null){ return ApiResponse.error(ErrorCodeEnum.MESSAGE_NOT_EXIST); } - if (!ProcessTypeEnum.HANDLE.equals(message.getProcessType())){ + if (!ProcessTypeEnum.HANDLE.getCode().equals(message.getProcessType())){ return ApiResponse.error(ErrorCodeEnum.MESSAGE_NOT_HANDLED); } storeMessageDAO.batchUpdateHandle(message.getId(), request.getShopCodeList()); From 339f42ab06802da7921e6393860ecb25bb072b7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Fri, 5 Sep 2025 13:39:29 +0800 Subject: [PATCH 17/19] =?UTF-8?q?feat:=E8=B7=B3=E8=BD=AC=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/MessageTemplateMapper.xml | 2 ++ .../src/main/java/com/cool/store/dto/notice/NoticeDTO.java | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/coolstore-partner-dao/src/main/resources/mapper/MessageTemplateMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/MessageTemplateMapper.xml index da19e7a78..75df2796f 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/MessageTemplateMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/MessageTemplateMapper.xml @@ -77,6 +77,8 @@ create_user_id as createUserId, create_time as createTime, handle_person_info as handlePersonInfo, + jump_type as jumpType, + jump_url as jumpUrl, store_info as storeInfo FROM zxjp_message_template WHERE deleted = 0 diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/notice/NoticeDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/notice/NoticeDTO.java index 6cfd8a3c6..686a6d490 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/notice/NoticeDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/notice/NoticeDTO.java @@ -79,4 +79,8 @@ public class NoticeDTO { private String storeInfo; + private Integer jump_type; + + private String jump_url; + } From 36ed7cdb8f0e988367dff20102559f8887508f5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Fri, 5 Sep 2025 14:53:37 +0800 Subject: [PATCH 18/19] =?UTF-8?q?feat:=E8=B7=B3=E8=BD=AC=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/dto/notice/NoticeDTO.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/notice/NoticeDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/notice/NoticeDTO.java index 686a6d490..acfc00cbb 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/notice/NoticeDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/notice/NoticeDTO.java @@ -79,8 +79,8 @@ public class NoticeDTO { private String storeInfo; - private Integer jump_type; + private Integer jumpType; - private String jump_url; + private String jumpUrl; } From 5c85b79c8e4c62a04e47e0885f391e80ec43494d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Mon, 8 Sep 2025 10:44:40 +0800 Subject: [PATCH 19/19] feat:user->person --- .../com/cool/store/service/impl/MessageTemplateServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java index 983812b92..4f5b1021f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java @@ -247,7 +247,7 @@ public class MessageTemplateServiceImpl implements MessageTemplateService { //组装人员信息 List userList = new ArrayList<>(); userInfoByUserMobileList.forEach(x -> { - CommonDTO user = new CommonDTO("user", x.getUserId(), x.getName()); + CommonDTO user = new CommonDTO("person", x.getUserId(), x.getName()); userList.add(user); }); userInfo = JSONObject.toJSONString(userList);