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 073a41e49..cd460d5dc 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
@@ -12,6 +12,7 @@ public enum FollowTaskStatusEnum {
FINISHED(1, "已完成"),
OVERDUE(2, "已逾期"),
CANCELLED(3, "作废"),
+ OVERDUE_FINISH(4, "逾期完成"),
;
//任务状态: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 750b40251..e00c7dfa1 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
@@ -86,10 +86,10 @@ public class HyFollowTaskDAO {
* @param followTaskId
* @return
*/
- public Integer finishFollowTask(Long followTaskId){
+ public Integer finishFollowTask(Long followTaskId, FollowTaskStatusEnum followTaskStatus){
HyFollowTaskDO update = new HyFollowTaskDO();
update.setId(followTaskId);
- update.setTaskStatus(FollowTaskStatusEnum.FINISHED.getCode());
+ update.setTaskStatus(followTaskStatus.getCode());
update.setFinishTime(new Date());
return updateFollowTask(update);
}
diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml
index bf939f198..fc8b6b75c 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml
@@ -169,7 +169,7 @@
- order by a.deadline desc
+ order by a.deadline desc, a.id desc