diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/FollowTaskStatusEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/FollowTaskStatusEnum.java
index cd460d5dc..387d4154a 100644
--- a/coolstore-partner-common/src/main/java/com/cool/store/enums/FollowTaskStatusEnum.java
+++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/FollowTaskStatusEnum.java
@@ -13,6 +13,7 @@ public enum FollowTaskStatusEnum {
     OVERDUE(2, "已逾期"),
     CANCELLED(3, "作废"),
     OVERDUE_FINISH(4, "逾期完成"),
+    OVERDUE_CANCELLED(5, "逾期作废"),
     ;
     //任务状态:0:待完成、1:已完成、2:已逾期、3:作废
 
diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyFollowTaskDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyFollowTaskDAO.java
index e00c7dfa1..1046558b0 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyFollowTaskDAO.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyFollowTaskDAO.java
@@ -99,10 +99,10 @@ public class HyFollowTaskDAO {
      * @param followTaskId
      * @return
      */
-    public Integer cancelFollowTask(Long followTaskId){
+    public Integer cancelFollowTask(Long followTaskId, FollowTaskStatusEnum followTaskStatus){
         HyFollowTaskDO update = new HyFollowTaskDO();
         update.setId(followTaskId);
-        update.setTaskStatus(FollowTaskStatusEnum.CANCELLED.getCode());
+        update.setTaskStatus(followTaskStatus.getCode());
         return updateFollowTask(update);
     }
 
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyFollowTaskDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyFollowTaskDO.java
index 36106228f..f20dea08b 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyFollowTaskDO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyFollowTaskDO.java
@@ -40,7 +40,7 @@ public class HyFollowTaskDO implements Serializable {
     @ApiModelProperty("计划沟通内容")
     private String communicationContent;
 
-    @ApiModelProperty("任务状态:0:待完成、1:已完成、2:已逾期、3:作废")
+    @ApiModelProperty("任务状态:0:待完成、1:已完成、2:已逾期、3:作废、4逾期完成、5逾期作废")
     private Integer taskStatus;
 
     @ApiModelProperty("任务截止时间")
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 3083a2700..4975d7279 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
@@ -149,7 +149,7 @@ public class FollowTaskServiceImpl implements FollowTaskService {
     @Override
     public Integer updateFollowTask(UpdateFollowTaskRequest request, String userId) {
         HyFollowTaskDO followTask = hyFollowTaskDAO.getFollowTask(request.getFollowTaskId());
-        if(FollowTaskStatusEnum.FINISHED.getCode().equals(followTask.getTaskStatus()) || FollowTaskStatusEnum.CANCELLED.getCode().equals(followTask.getTaskStatus())){
+        if(FollowTaskStatusEnum.FINISHED.getCode().equals(followTask.getTaskStatus()) || FollowTaskStatusEnum.CANCELLED.getCode().equals(followTask.getTaskStatus())|| FollowTaskStatusEnum.OVERDUE_CANCELLED.getCode().equals(followTask.getTaskStatus())){
             throw new ServiceException(ErrorCodeEnum.TASK_STATUS_NOT_ALLOW_OPERATE);
         }
         if(Objects.nonNull(request.getDeadline()) && request.getDeadline().getTime() < System.currentTimeMillis()){
@@ -181,11 +181,15 @@ public class FollowTaskServiceImpl implements FollowTaskService {
     @Override
     public Integer cancelFollowTask(FollowTaskIdRequest request, String userId) {
         HyFollowTaskDO followTask = hyFollowTaskDAO.getFollowTask(request.getFollowTaskId());
-        if(FollowTaskStatusEnum.FINISHED.getCode().equals(followTask.getTaskStatus())){
+        if(FollowTaskStatusEnum.FINISHED.getCode().equals(followTask.getTaskStatus()) || FollowTaskStatusEnum.OVERDUE_FINISH.getCode().equals(followTask.getTaskStatus())){
             throw new ServiceException(ErrorCodeEnum.TASK_STATUS_NOT_ALLOW_OPERATE);
         }
         checkLine(followTask.getPartnerLineId());
-        return hyFollowTaskDAO.cancelFollowTask(request.getFollowTaskId());
+        FollowTaskStatusEnum followTaskStatus = FollowTaskStatusEnum.CANCELLED;
+        if(followTask.getDeadline().getTime() < System.currentTimeMillis()){
+            followTaskStatus = FollowTaskStatusEnum.OVERDUE_CANCELLED;
+        }
+        return hyFollowTaskDAO.cancelFollowTask(request.getFollowTaskId(), followTaskStatus);
     }
 
     @Override