From 4519286928be58b5bee8d886a1ed700c64618541 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: Wed, 28 Jun 2023 19:56:36 +0800
Subject: [PATCH] userInfo

---
 .../main/resources/mapper/HyPartnerLineInfoMapper.xml  |  2 +-
 .../cool/store/service/HyPartnerLineInfoService.java   |  2 +-
 .../service/impl/HyPartnerLineInfoServiceImpl.java     | 10 ++++++----
 .../java/com/cool/store/controller/DeskController.java |  2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
index 7317fa4e8..eff46ce7c 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
@@ -579,7 +579,7 @@
   <select id="getLineFollowHistoryList" resultMap="BaseResultMap">
     SELECT <include refid="Base_Column_List"></include>
     FROM hy_partner_line_info
-    where (deleted = 1 or (deleted=0 and line_status=0 and close_time is not null))
+    where (deleted = 1 or (deleted=0 and line_status in (0,3) and close_time is not null))
     and partner_id = #{partner_id}
   </select>
 
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java
index ca51f1c12..79e569b8c 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java
@@ -83,7 +83,7 @@ public interface HyPartnerLineInfoService {
      * @param joinReason
      * @return
      */
-     Boolean joinBlackList(LoginUserInfo user, Long lineId, Integer status, String joinReason);
+     Boolean joinBlackList(LoginUserInfo user, Long lineId, Integer status, String joinReason) throws ApiException;
 
     /**
      * 移除黑名单
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 e0fe9f3db..e4c17326a 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
@@ -244,7 +244,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
     }
 
     @Override
-    public Boolean joinBlackList(LoginUserInfo user, Long lineId, Integer status, String joinReason) {
+    public Boolean joinBlackList(LoginUserInfo user, Long lineId, Integer status, String joinReason) throws ApiException {
         if (lineId==null){
             throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED);
         }
@@ -257,10 +257,13 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
         hyPartnerLineInfoDO.setRejectRealReason(joinReason);
         hyPartnerLineInfoDO.setCloseTime(new Date());
         hyPartnerLineInfoDO.setCloseUserId(user.getUserId());
-        hyPartnerLineInfoDO.setWorkflowStage(WorkflowStageEnum.INTENT.getCode());
-        hyPartnerLineInfoDO.setWorkflowStatus(WorkflowStatusEnum.INTENT_0.getCode());
         hyPartnerLineInfoDAO.updateByPrimaryKeySelective(hyPartnerLineInfoDO);
 
+        CloseFollowRequest closeFollowRequest = new CloseFollowRequest();
+        closeFollowRequest.setLineId(lineId);
+        closeFollowRequest.setRejectRealReason(joinReason);
+        workFlowService.endProcess(WorkflowStageEnum.getWorkflowStageByCode(line.getWorkflowStage()),closeFollowRequest);
+
         //添加日志
         LineLogInfo lineLogInfo = new LineLogInfo(line.getPartnerId(), line.getId(), user.getUserId(),
                 user.getName(), OperateTypeEnum.ADD_BLACKLIST,
@@ -283,7 +286,6 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
         HyPartnerLineInfoDO hyPartnerLineInfo = hyPartnerLineInfoDAO.selectByPrimaryKeySelective(lineId);
         HyPartnerLineInfoDO hyPartnerLineInfoDO = new HyPartnerLineInfoDO();
         hyPartnerLineInfoDO.setId(lineId);
-        hyPartnerLineInfoDO.setLineStatus(status);
         hyPartnerLineInfoDO.setRemoveBlackReason(removeReason);
         hyPartnerLineInfoDO.setDeleted(Boolean.TRUE);
         hyPartnerLineInfoDAO.updateByPrimaryKeySelective(hyPartnerLineInfoDO);
diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java
index fdfc79508..65f8016e6 100644
--- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java
+++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java
@@ -235,7 +235,7 @@ public class DeskController {
 
     @PostMapping(path = "/joinBlackList")
     @ApiOperation("加入黑名单")
-    public ResponseResult<Boolean> joinBlackList(@RequestBody LineBlackListRequest lineBlackListRequest){
+    public ResponseResult<Boolean> joinBlackList(@RequestBody LineBlackListRequest lineBlackListRequest) throws ApiException {
 
         return ResponseResult.success(hyPartnerLineInfoService.joinBlackList(CurrentUserHolder.getUser(),lineBlackListRequest.getLineId(),LineStatusEnum.BLACKLIST.getCode(),lineBlackListRequest.getCause()));
     }