From 8680c3df39c484d2704c28740845700099052c81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 23 Apr 2024 16:13:28 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E6=9C=9F=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/enums/WorkflowSubStageEnum.java | 6 ++-- .../store/enums/point/ShopSubStageEnum.java | 30 +++++++++---------- .../store/service/impl/LineServiceImpl.java | 4 +-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowSubStageEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowSubStageEnum.java index b52e70b96..db5edf553 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowSubStageEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowSubStageEnum.java @@ -10,11 +10,11 @@ public enum WorkflowSubStageEnum{ /** * 流程子阶段枚举 */ - INTEND(1, "加盟意向申请", WorkflowSubStageStatusEnum.INTENT_0,"joinIntentionServiceImpl",1), + INTEND(1, "加盟意向申请", WorkflowSubStageStatusEnum.INTENT_0,"joinIntentionServiceImpl",0), INVITING_INTERVIEWS(5, "邀约面谈", WorkflowSubStageStatusEnum.INVITING_INTERVIEWS_10, "lineInterviewServiceImpl",2), FIRST_INTERVIEWS(10, "一审面试", WorkflowSubStageStatusEnum.FIRST_INTERVIEWS_25, "lineInterviewServiceImpl",4), - PAY_DEPOSIT(15, "缴纳意向金", WorkflowSubStageStatusEnum.PAY_DEPOSIT_45, "bankServiceImpl",5), - SIGN_INTENT_AGREEMENT(20, "签署意向协议", WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_60, "intentAgreementServiceImpl",7), + PAY_DEPOSIT(15, "缴纳意向金", WorkflowSubStageStatusEnum.PAY_DEPOSIT_45, "bankServiceImpl",4), + SIGN_INTENT_AGREEMENT(20, "签署意向协议", WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_60, "intentAgreementServiceImpl",6), STORE_EXPERIENCE(25, "门店体验", WorkflowSubStageStatusEnum.STORE_EXPERIENCE_85, "trainingExperienceServiceImpl",9), SECOND_INTERVIEWS(30, "二审面试", WorkflowSubStageStatusEnum.SECOND_INTERVIEWS_100, "lineInterviewServiceImpl",10); 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 5f410e516..599bb59f0 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 @@ -12,21 +12,21 @@ import java.util.List; */ public enum ShopSubStageEnum { - SHOP_STAGE_1(ShopStageEnum.SHOP_STAGE_1, 10, "选址", 3), - SHOP_STAGE_2(ShopStageEnum.SHOP_STAGE_1, 20, "上传租赁合同", 2), - SHOP_STAGE_3(ShopStageEnum.SHOP_STAGE_2, 30, "系统建店", 2), - SHOP_STAGE_4(ShopStageEnum.SHOP_STAGE_2, 40, "证照办理", 2), - SHOP_STAGE_5(ShopStageEnum.SHOP_STAGE_2, 50, "员工招聘", 2), - SHOP_STAGE_6(ShopStageEnum.SHOP_STAGE_2, 60, "加盟商/员工培训", 2), - SHOP_STAGE_7(ShopStageEnum.SHOP_STAGE_2, 70, "缴纳加盟费/保证金", 2), - SHOP_STAGE_8(ShopStageEnum.SHOP_STAGE_2, 80, "加盟合同签约", 2), - SHOP_STAGE_9(ShopStageEnum.SHOP_STAGE_2, 90, "设计阶段", 2), - SHOP_STAGE_10(ShopStageEnum.SHOP_STAGE_2, 100, "装修款", 2), - SHOP_STAGE_11(ShopStageEnum.SHOP_STAGE_2, 110, "施工阶段", 2), - SHOP_STAGE_12(ShopStageEnum.SHOP_STAGE_2, 120, "三方验收", 2), - SHOP_STAGE_13(ShopStageEnum.SHOP_STAGE_2, 130, "视觉验收", 2), - SHOP_STAGE_14(ShopStageEnum.SHOP_STAGE_2, 140, "开业运营方案", 2), - SHOP_STAGE_15(ShopStageEnum.SHOP_STAGE_2, 150, "首批订货清单", 2), + SHOP_STAGE_1(ShopStageEnum.SHOP_STAGE_1, 10, "选址", 12), + SHOP_STAGE_2(ShopStageEnum.SHOP_STAGE_1, 20, "上传租赁合同", 14), + SHOP_STAGE_3(ShopStageEnum.SHOP_STAGE_2, 30, "系统建店", 19), + SHOP_STAGE_4(ShopStageEnum.SHOP_STAGE_2, 40, "证照办理", 24), + SHOP_STAGE_5(ShopStageEnum.SHOP_STAGE_2, 50, "员工招聘", 23), + SHOP_STAGE_6(ShopStageEnum.SHOP_STAGE_2, 60, "加盟商/员工培训", 30), + SHOP_STAGE_7(ShopStageEnum.SHOP_STAGE_2, 70, "缴纳加盟费/保证金", 1), + SHOP_STAGE_8(ShopStageEnum.SHOP_STAGE_2, 80, "加盟合同签约", 4), + SHOP_STAGE_9(ShopStageEnum.SHOP_STAGE_2, 90, "设计阶段", 24), + SHOP_STAGE_10(ShopStageEnum.SHOP_STAGE_2, 100, "装修款", 25), + SHOP_STAGE_11(ShopStageEnum.SHOP_STAGE_2, 110, "施工阶段", 29), + SHOP_STAGE_12(ShopStageEnum.SHOP_STAGE_2, 120, "三方验收", 26), + SHOP_STAGE_13(ShopStageEnum.SHOP_STAGE_2, 130, "视觉验收", 26), + SHOP_STAGE_14(ShopStageEnum.SHOP_STAGE_2, 140, "开业运营方案", 23), + SHOP_STAGE_15(ShopStageEnum.SHOP_STAGE_2, 150, "首批订货清单", 20), ; //阶段 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java index 398fd4f93..4a8142d30 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java @@ -314,7 +314,7 @@ public class LineServiceImpl implements LineService { return null; } //总天数 - Integer totalDays = 20; + Integer totalDays = 10; IntendProcessTotalVO intendProcessTotalVO = new IntendProcessTotalVO(); intendProcessTotalVO.setTotalDays(totalDays); intendProcessTotalVO.setCompletionTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,DateUtils.addDays(memberQuestionDO.getCreateTime(),totalDays))); @@ -365,7 +365,7 @@ public class LineServiceImpl implements LineService { for (WorkflowSubStageEnum workflowSubStageEnum : WorkflowSubStageEnum.values()) { IntendProcessVO intend = getIntend(memberQuestionDO.getCreateTime(), workflowSubStageEnum); if (map.get(workflowSubStageEnum.getCode())!=null){ - intend.setActualTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,DateUtils.addDays(map.get(workflowSubStageEnum.getCode()),workflowSubStageEnum.getProgress()))); + intend.setActualTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,map.get(workflowSubStageEnum.getCode()))); } list.add(intend); }