suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

编辑跟进任务一小时内发送消息

Browse Source
This commit is contained in:
zhangchenbiao
2023-08-24 17:07:07 +08:00
parent cf584639d9
commit 77389e6102
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coolstore-partner-model/src/main/java/com/cool/store/request/follow/UpdateFollowTaskRequest.java
View File

@@ -45,10 +45,11 @@ public class UpdateFollowTaskRequest {
@ApiModelProperty("任务截止时间") @ApiModelProperty("任务截止时间")
private Date deadline; 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(); HyFollowTaskDO result = new HyFollowTaskDO();
result.setId(request.getFollowTaskId()); result.setId(request.getFollowTaskId());
result.setPartnerLineId(partnerLineId); result.setPartnerLineId(partnerLineId);
result.setFollowUserId(followUserId);
result.setTaskTitle(request.getTaskTitle()); result.setTaskTitle(request.getTaskTitle());
result.setCommunicationType(request.getCommunicationType()); result.setCommunicationType(request.getCommunicationType());
result.setDeadline(request.getDeadline()); result.setDeadline(request.getDeadline());

8
coolstore-partner-service/src/main/java/com/cool/store/service/impl/FollowTaskServiceImpl.java
View File

@@ -156,7 +156,7 @@ public class FollowTaskServiceImpl implements FollowTaskService {
throw new ServiceException(ErrorCodeEnum.DATELINE_BEFORE_NOW); throw new ServiceException(ErrorCodeEnum.DATELINE_BEFORE_NOW);
} }
checkLine(followTask.getPartnerLineId()); 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){ if(!request.getDeadline().equals(followTask.getDeadline()) && (request.getDeadline().getTime() - System.currentTimeMillis()) / CommonConstants.ONE_THOUSAND < CommonConstants.AN_HOUR_SECONDS){
//一小时内的任务立即发送通知 //一小时内的任务立即发送通知
sendMessage(task); sendMessage(task);
@@ -274,12 +274,6 @@ public class FollowTaskServiceImpl implements FollowTaskService {
if(Objects.isNull(partnerInfo)){ if(Objects.isNull(partnerInfo)){
return; 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 dateline = DateUtil.format(task.getDeadline(), CoolDateUtils.DATE_FORMAT_SEC_7);
String content = MessageFormat.format(MessageConstants.FOLLOW_TASK_MESSAGE_CONTENT, dateline, partnerInfo.getUsername(), partnerInfo.getMobile()); String content = MessageFormat.format(MessageConstants.FOLLOW_TASK_MESSAGE_CONTENT, dateline, partnerInfo.getUsername(), partnerInfo.getMobile());
noticeService.sendFeiShuNotice(FeiShuNoticeMsgEnum.FOLLOW_TASK, Arrays.asList(task.getFollowUserId()), content); noticeService.sendFeiShuNotice(FeiShuNoticeMsgEnum.FOLLOW_TASK, Arrays.asList(task.getFollowUserId()), content);