From a68e425524006420b9d219a005f4359defa2eb82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <zhuhong.su@coolcollege.cn>
Date: Tue, 15 Aug 2023 16:22:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E5=BA=9F=E5=BE=85=E5=AE=8C=E6=88=90&?=
 =?UTF-8?q?=E5=B7=B2=E9=80=BE=E6=9C=9F=E7=9A=84=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/cool/store/request/AddTagsRequest.java   |  2 +-
 .../service/impl/HyPartnerLineInfoServiceImpl.java    | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AddTagsRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AddTagsRequest.java
index ae3bbfdcb..0f76c6ae6 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/request/AddTagsRequest.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/AddTagsRequest.java
@@ -18,5 +18,5 @@ public class AddTagsRequest {
     @ApiModelProperty("加盟申请基本信息ID")
     private Long  partnerBaseInfoId;
     @ApiModelProperty("标签列表")
-    private List<Long> Tags;
+    private List<Long> tags;
 }
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
index bf66c6778..0032d49a1 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
@@ -89,6 +89,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
 
     @Autowired
     private SmsService smsService;
+    @Resource
+    HyFollowTaskDAO hyFollowTaskDAO;
 
     @Override
     public StageCountVO selectStagePendingCount(String userId) {
@@ -187,6 +189,9 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
         HyPartnerBaseInfoDO hyPartnerBaseInfoDO = hyPartnerBaseInfoDAO.getByPartnerLineId(request.getLineId());
         noticeService.sendFeiShuNotice(FeiShuNoticeMsgEnum.TRANS_INVESTMENT_MANAGER,Arrays.asList(request.getUserId()),DateUtil.formatDateTime(new Date()),hyPartnerBaseInfoDO.getUsername(),hyPartnerBaseInfoDO.getMobile());
 
+        //作废待完成&已逾期的任务
+        hyFollowTaskDAO.cancelUndoFollowTask(request.getLineId());
+
         //添加日志
         LineLogInfo lineLogInfo = new LineLogInfo(hyPartnerLineInfoDO.getPartnerId(), hyPartnerLineInfoDO.getId(), user.getUserId(),
                 user.getName(), OperateTypeEnum.TRANSFER_INVESTMENT_MANAGER,
@@ -315,6 +320,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
         hyPartnerLineInfoDO.setCloseUserId(user.getUserId());
         hyPartnerLineInfoDAO.updateByPrimaryKeySelective(hyPartnerLineInfoDO);
 
+        hyFollowTaskDAO.cancelUndoFollowTask(lineId);
+
         //公海线索不需要处理子流程线索
         if (!LineStatusEnum.PUBLIC_SEAS.getCode().equals(lineStatus)){
             CloseFollowRequest closeFollowRequest = new CloseFollowRequest();
@@ -433,6 +440,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
             hyPartnerLineInfoDO.setLineStatus(LineStatusEnum.PUBLIC_SEAS.getCode());
             hyPartnerLineInfoDO.setCloseTime(new Date());
             hyPartnerLineInfoDO.setCloseUserId(user.getUserId());
+            //作废待完成&已逾期的任务
+            hyFollowTaskDAO.cancelUndoFollowTask(closeFollowRequest.getLineId());
             //各阶段单独的逻辑
             workFlowService.endProcess(WorkflowStageEnum.getWorkflowStageByCode(hyPartnerLineInfoDO.getWorkflowStage()),closeFollowRequest);
         }
@@ -449,6 +458,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
             hyPartnerLineInfoDO.setRejectRealReason(closeFollowRequest.getRejectRealReason());
             hyPartnerLineInfoDO.setLineStatus(LineStatusEnum.PUBLIC_SEAS.getCode());
             hyPartnerLineInfoDO.setCloseTime(new Date());
+            //作废待完成&已逾期的任务
+            hyFollowTaskDAO.cancelUndoFollowTask(closeFollowRequest.getLineId());
         }
         hyPartnerLineInfoDAO.updateByPrimaryKeySelective(hyPartnerLineInfoDO);