From a655ddefb0766f6c1e834403e3271bd16c5d9942 Mon Sep 17 00:00:00 2001
From: zhangchenbiao <chenbiao.zhang@coolcollege.cn>
Date: Wed, 23 Aug 2023 19:46:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=BE=E6=9C=9F=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/cool/store/enums/FollowTaskStatusEnum.java     | 1 +
 .../src/main/java/com/cool/store/dao/HyFollowTaskDAO.java   | 4 ++--
 .../src/main/resources/mapper/HyFollowTaskMapper.xml        | 2 +-
 .../main/java/com/cool/store/vo/follow/FollowTaskLogVO.java | 1 -
 .../com/cool/store/service/impl/FollowTaskServiceImpl.java  | 6 +++++-
 5 files changed, 9 insertions(+), 5 deletions(-)

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 @@
             <if test="deadlineEndTime != null">
                 <![CDATA[ and a.deadline <= #{deadlineEndTime}]]>
             </if>
-        order by a.deadline desc
+        order by a.deadline desc, a.id desc
     </select>
 
     <select id="getFollowTask" resultMap="BaseResultMap">
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/follow/FollowTaskLogVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/follow/FollowTaskLogVO.java
index c707bbca9..266c0a8ea 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/follow/FollowTaskLogVO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/follow/FollowTaskLogVO.java
@@ -1,7 +1,6 @@
 package com.cool.store.vo.follow;
 
 import com.alibaba.fastjson.JSONObject;
-import com.cool.store.dto.log.LogFieldDTO;
 import com.cool.store.entity.CallRecordDO;
 import com.cool.store.entity.HyFollowTaskDO;
 import com.cool.store.entity.HyPartnerTaskInfoLogDO;
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 bc1d7b94f..3083a2700 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
@@ -171,7 +171,11 @@ public class FollowTaskServiceImpl implements FollowTaskService {
             throw new ServiceException(ErrorCodeEnum.TASK_STATUS_NOT_ALLOW_OPERATE);
         }
         checkLine(followTask.getPartnerLineId());
-        return hyFollowTaskDAO.finishFollowTask(request.getFollowTaskId());
+        FollowTaskStatusEnum followTaskStatus = FollowTaskStatusEnum.FINISHED;
+        if(followTask.getDeadline().getTime() < System.currentTimeMillis()){
+            followTaskStatus = FollowTaskStatusEnum.OVERDUE_FINISH;
+        }
+        return hyFollowTaskDAO.finishFollowTask(request.getFollowTaskId(), followTaskStatus);
     }
 
     @Override