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 7da54e599..7228f5e82 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 @@ -299,6 +299,7 @@ public enum ErrorCodeEnum { STORE_MESSAGE_REVOKE(1610003,"当前门店消息已撤销,请务重复操作",null), STORE_MESSAGE_HANDLED(1610004,"当前门店消息已处理,无法撤销!",null), MATTER_STORE_OR_USER_IS_NULL(1610005,"当前事项门店或者人员为空,发布失败,请确认!",null), + CONFIG_NOT_EXIST(1610006,"配置不存在或被禁用,请确认!",null); ; 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 6ba37acb5..9b2838208 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 @@ -58,4 +58,6 @@ public class ThirdMatterRequest { @ApiModelProperty("手机号列表 如果不传 默认取matterConfigId配置的人员信息 如果都没有 任务处于待发布状态") List mobileList; + private String jumpUrl; + } 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 9ca319667..aae2855f5 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 @@ -187,8 +187,12 @@ public class MessageTemplateServiceImpl implements MessageTemplateService { @Override public ApiResponse thirdMatterHandle(ThirdMatterRequest thirdMatterRequest) { + log.info("thirdMatterHandle request:{}", JSONObject.toJSONString(thirdMatterRequest)); //第三方事项处理 MatterConfigDO matterConfig = matterConfigDAO.getById(thirdMatterRequest.getMatterConfigId()); + if (matterConfig==null||matterConfig.getStatus()==0){ + return ApiResponse.error(ErrorCodeEnum.CONFIG_NOT_EXIST); + } //封装事项模版 MessageTemplateDO messageTemplateDO = new MessageTemplateDO(); messageTemplateDO.setMessageCode(getMessageTemplateCode()); @@ -212,6 +216,8 @@ public class MessageTemplateServiceImpl implements MessageTemplateService { if (MatterTypeEnum.LOGISTICS.getCode().equals(matterConfig.getMatterType())){ SceneEnum scene = SceneEnum.getByCode(thirdMatterRequest.getSceneCode()); messageTemplateDO.setMessageImage(scene.getScenePicture()); + //物流直接使用传过来的地址 + messageTemplateDO.setJumpUrl(thirdMatterRequest.getJumpUrl()); } //如果是盘点 截止日期去当天 if (MatterTypeEnum.INVENTORY.getCode().equals(matterConfig.getMatterType())){