From dee76b73f7a206a60f60b8f06480fd345d6e089e Mon Sep 17 00:00:00 2001
From: zhangchenbiao <chenbiao.zhang@coolcollege.cn>
Date: Tue, 16 Apr 2024 15:50:07 +0800
Subject: [PATCH] fix

---
 .../store/enums/point/ShopSubStageEnum.java     | 17 +++++------------
 .../enums/point/ShopSubStageStatusEnum.java     |  2 ++
 .../com/cool/store/dao/ShopStageInfoDAO.java    |  2 +-
 .../resources/mapper/LineInterviewMapper.xml    |  5 ++++-
 .../store/request/LineInterviewPageRequest.java |  2 ++
 .../service/impl/LineInterviewServiceImpl.java  |  6 ++++++
 6 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageEnum.java
index aee93331b..882c11e16 100644
--- a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageEnum.java
+++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageEnum.java
@@ -78,26 +78,19 @@ public enum ShopSubStageEnum {
         switch (this){
             case SHOP_STAGE_1:
                 return ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_0;
-            case SHOP_STAGE_2:
-                return ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_2;
-            case SHOP_STAGE_3:
-                return ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_6;
-            case SHOP_STAGE_4:
-                return ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_10;
             case SHOP_STAGE_5:
                 return ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_14;
-            case SHOP_STAGE_6:
-                return ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_16;
             case SHOP_STAGE_7:
                 return ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_18;
+            case SHOP_STAGE_2:
+            case SHOP_STAGE_3:
+            case SHOP_STAGE_4:
+            case SHOP_STAGE_6:
             case SHOP_STAGE_8:
-                return ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_21;
             case SHOP_STAGE_9:
-                return ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_27;
             case SHOP_STAGE_10:
-                return ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_32;
             case SHOP_STAGE_11:
-                return ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_35;
+                return ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00;
             default:
                 return null;
         }
diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java
index a637b735a..2bbcc670a 100644
--- a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java
+++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java
@@ -11,6 +11,8 @@ import java.util.List;
  */
 public enum ShopSubStageStatusEnum {
 
+    SHOP_SUB_STAGE_STATUS_00(null, -100, "未开始", Boolean.FALSE),
+
     //选址
     SHOP_SUB_STAGE_STATUS_0(ShopSubStageEnum.SHOP_STAGE_1, 100, "待选址", Boolean.FALSE),
     SHOP_SUB_STAGE_STATUS_1(ShopSubStageEnum.SHOP_STAGE_1, 110, "已选址", Boolean.TRUE),
diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java
index 2ff9813db..4ef656ece 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java
@@ -53,7 +53,7 @@ public class ShopStageInfoDAO {
                 ShopSubStageStatusEnum initStatus = shopSubStageEnum.getInitStatus();
                 shopStageInfo.setShopSubStageStatus(initStatus.getShopSubStageStatus());
                 shopStageInfo.setRemark(shopSubStageEnum.getShopSubStageName() + CommonConstants.PATH_BAR +shopSubStageEnum.getInitStatus().getShopSubStageStatusName());
-                shopStageInfo.setIsTerminated(initStatus.isTerminated());
+                shopStageInfo.setIsTerminated(Boolean.FALSE);
                 shopStageInfo.setPlanCompleteTime(shopSubStageEnum.getPlanCompleteTime(selectStartDate, planSelectPointCompleteDate));
                 addShopStageList.add(shopStageInfo);
             }
diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineInterviewMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInterviewMapper.xml
index cfc481db1..194edb1d4 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/LineInterviewMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/LineInterviewMapper.xml
@@ -90,11 +90,14 @@
       and a.interviewer_user_id = #{interviewerUserId}
     </if>
     <if test="wantShopAreaIds != null and wantShopAreaIds.size() > 0">
-      b.want_shop_area_id in
+      and b.want_shop_area_id in
       <foreach collection="wantShopAreaIds" item="item" separator="," open="(" close=")">
         #{item}
       </foreach>
     </if>
+    <if test="request.areaPath != null">
+      and b.want_shop_area_id in (select id from xfsg_open_area_info where area_path like concat(#{request.areaPath}, '%'))
+    </if>
   </select>
   
   <select id="getInterviewInfoByRoomId" resultMap="BaseResultMap">
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/LineInterviewPageRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/LineInterviewPageRequest.java
index cba95e373..12660c6ac 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/request/LineInterviewPageRequest.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/LineInterviewPageRequest.java
@@ -53,4 +53,6 @@ public class LineInterviewPageRequest extends PageBasicInfo {
     private String interviewerUserId;
 
     private List<Long> wantShopAreaIds;
+
+    private String areaPath;
 }
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java
index d4ef2b3ac..0be8de675 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java
@@ -251,6 +251,12 @@ public class LineInterviewServiceImpl extends LineFlowService implements LineInt
                 request.setWantShopAreaIds(wantShopAreaIds);
             }
         }
+        if(Objects.nonNull(request.getWantShopAreaId())){
+            HyOpenAreaInfoDO areaInfo = hyOpenAreaInfoDAO.selectById(request.getWantShopAreaId());
+            if(Objects.nonNull(areaInfo)){
+                request.setAreaPath(areaInfo.getAreaPath());
+            }
+        }
         Page<LineInterviewPageDTO> pageInfo = lineInterviewDAO.getInterviewerPage(request);
         List<String> userPortraitList  = pageInfo.stream().filter(x -> StringUtils.isNotEmpty(x.getUserPortrait() )).map(LineInterviewPageDTO::getUserPortrait).collect(Collectors.toList());
         List<String> investmentManagerUserIds = pageInfo.stream().filter(x -> StringUtils.isNotEmpty(x.getInvestmentManager() )).map(LineInterviewPageDTO::getInvestmentManager).collect(Collectors.toList());