From 77389e6102d973356c49b4270b3ebe9b3796f485 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Thu, 24 Aug 2023 17:07:07 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E8=B7=9F=E8=BF=9B=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E4=B8=80=E5=B0=8F=E6=97=B6=E5=86=85=E5=8F=91=E9=80=81?= =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/request/follow/UpdateFollowTaskRequest.java | 3 ++- .../cool/store/service/impl/FollowTaskServiceImpl.java | 8 +------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/follow/UpdateFollowTaskRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/follow/UpdateFollowTaskRequest.java index 87faf6b06..3fceba0f4 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/follow/UpdateFollowTaskRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/follow/UpdateFollowTaskRequest.java @@ -45,10 +45,11 @@ public class UpdateFollowTaskRequest { @ApiModelProperty("任务截止时间") private Date deadline; - public static HyFollowTaskDO convertDO(Long partnerLineId, UpdateFollowTaskRequest request){ + public static HyFollowTaskDO convertDO(Long partnerLineId, String followUserId, UpdateFollowTaskRequest request){ HyFollowTaskDO result = new HyFollowTaskDO(); result.setId(request.getFollowTaskId()); result.setPartnerLineId(partnerLineId); + result.setFollowUserId(followUserId); result.setTaskTitle(request.getTaskTitle()); result.setCommunicationType(request.getCommunicationType()); result.setDeadline(request.getDeadline()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FollowTaskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FollowTaskServiceImpl.java index 4975d7279..88fe9c0ad 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FollowTaskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FollowTaskServiceImpl.java @@ -156,7 +156,7 @@ public class FollowTaskServiceImpl implements FollowTaskService { throw new ServiceException(ErrorCodeEnum.DATELINE_BEFORE_NOW); } checkLine(followTask.getPartnerLineId()); - HyFollowTaskDO task = UpdateFollowTaskRequest.convertDO(followTask.getPartnerLineId(), request); + HyFollowTaskDO task = UpdateFollowTaskRequest.convertDO(followTask.getPartnerLineId(),followTask.getFollowUserId(), request); if(!request.getDeadline().equals(followTask.getDeadline()) && (request.getDeadline().getTime() - System.currentTimeMillis()) / CommonConstants.ONE_THOUSAND < CommonConstants.AN_HOUR_SECONDS){ //一小时内的任务立即发送通知 sendMessage(task); @@ -274,12 +274,6 @@ public class FollowTaskServiceImpl implements FollowTaskService { if(Objects.isNull(partnerInfo)){ return; } - /*String lockKey = MessageFormat.format(CommonConstants.FOLLOW_TASK_NOTICE_KEY, task.getFollowUserId(), task.getId()); - boolean result = redisUtilPool.setNxExpire(lockKey, DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC), CommonConstants.FOLLOW_TASK_NOTICE_LOCK_TIMES); - if(!result){ - //一小时内发送过不再发送通知 - return; - }*/ String dateline = DateUtil.format(task.getDeadline(), CoolDateUtils.DATE_FORMAT_SEC_7); String content = MessageFormat.format(MessageConstants.FOLLOW_TASK_MESSAGE_CONTENT, dateline, partnerInfo.getUsername(), partnerInfo.getMobile()); noticeService.sendFeiShuNotice(FeiShuNoticeMsgEnum.FOLLOW_TASK, Arrays.asList(task.getFollowUserId()), content);