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} - b.want_shop_area_id in + and b.want_shop_area_id in #{item} + + and b.want_shop_area_id in (select id from xfsg_open_area_info where area_path like concat(#{request.areaPath}, '%')) +