diff --git a/coolstore-partner-dao/src/main/resources/mapper/DecorationDesignInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/DecorationDesignInfoMapper.xml index 4239cf90c..2ae224431 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/DecorationDesignInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/DecorationDesignInfoMapper.xml @@ -43,6 +43,7 @@ c.line_id as lineId, c.region_id as regionId, c.store_type as storeType, + c.join_mode as joinMode, b.shop_stage as stage, b.shop_sub_stage as subStage, b.shop_sub_stage_status as subStageStatus, diff --git a/coolstore-partner-dao/src/main/resources/mapper/DecorationMeasureMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/DecorationMeasureMapper.xml index f8a1789c4..c2ac41606 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/DecorationMeasureMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/DecorationMeasureMapper.xml @@ -38,6 +38,7 @@ c.id as shopId, c.line_id as lineId, c.region_id as regionId, + c.join_mode as joinMode, c.store_type as storeType, b.shop_stage as stage, b.shop_sub_stage as subStage, @@ -62,6 +63,7 @@ c.line_id as lineId, c.region_id as regionId, c.store_type as storeType, + c.join_mode as joinMode, b.shop_stage as stage, b.shop_sub_stage as subStage, b.shop_sub_stage_status as subStageStatus, @@ -85,6 +87,7 @@ c.line_id as lineId, c.region_id as regionId, c.store_type as storeType, + c.join_mode as joinMode, b.shop_stage as stage, b.shop_sub_stage as subStage, b.shop_sub_stage_status as subStageStatus, diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/BaseInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/BaseInfoVO.java index c0059250c..7527bb988 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/BaseInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/BaseInfoVO.java @@ -42,6 +42,8 @@ public class BaseInfoVO { @ApiModelProperty("子阶段状态") private Integer workflowSubStageStatus; + @ApiModelProperty("加盟模式") + private Integer joinMode; public BaseInfoVO(){} /** @@ -59,6 +61,7 @@ public class BaseInfoVO { this.userPortraitList = baseInfoVO.getUserPortraitList(); this.workflowStage = baseInfoVO.getWorkflowStage(); this.workflowSubStageStatus = baseInfoVO.getWorkflowSubStageStatus(); + this.joinMode = baseInfoVO.getJoinMode(); } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/PreparationCommonPendingVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/PreparationCommonPendingVO.java index 9f3435fa9..d0a5b0df2 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/PreparationCommonPendingVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/PreparationCommonPendingVO.java @@ -45,6 +45,8 @@ public class PreparationCommonPendingVO { private String submitTime; @ApiModelProperty("门店类型") private Integer storeType; + @ApiModelProperty("加盟模式") + private Integer joinMode; private Long regionId; private Date updateTime; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java index 13c0bc5f7..87afc1c9d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java @@ -132,6 +132,7 @@ public class DeskServiceImpl implements DeskService { payStagePendingVO.setPayTime(DateUtils.parseDateToStr(SPECIAL_DATE_START, linePayDO.getPayTime())); } + list.add(payStagePendingVO); }); page.setList(list); @@ -192,6 +193,7 @@ public class DeskServiceImpl implements DeskService { }); } baseInfoVO.setUserPortraitList(labelBaseInfoList); + baseInfoVO.setJoinMode(lineInfoDO.getJoinMode()); baseInfoVO.setWantShopAreaName(wantShopAreaMap.get(lineInfoDO.getWantShopAreaId())); return baseInfoVO; } @@ -442,7 +444,7 @@ public class DeskServiceImpl implements DeskService { //只有设计组长 查询 指定当前用户和阶段为 900 待分配设计师 if (userRoleIds.contains(UserRoleEnum.HEAD_OF_DESIGN.getCode()) && !userRoleIds.contains(UserRoleEnum.DESIGN_CUSTOMER.getCode())) { PageHelper.startPage(pageNum, pageSize); - return decorationMeasureDAO.getShopIdListByDesignUserIdAndShopStage(user.getUserId()); + return decorationMeasureDAO.getShopIdListByDesignUserIdAndShopStage(user.getUserId()); } //只有设计师 查询 指定当前用户和阶段为 901 设计中 if (userRoleIds.contains(UserRoleEnum.DESIGN_CUSTOMER.getCode()) && !userRoleIds.contains(UserRoleEnum.HEAD_OF_DESIGN.getCode())) { @@ -450,7 +452,7 @@ public class DeskServiceImpl implements DeskService { return decorationDesignInfoDAO.getByDesignUserIdAndShopStage(user.getUserId()); } //有 设计组长 和 设计师 查询 指定当前用户和 阶段为 900 待分配设计师 阶段为 901 设计中 - if (userRoleIds.contains(UserRoleEnum.DESIGN_CUSTOMER.getCode()) && userRoleIds.contains(UserRoleEnum.HEAD_OF_DESIGN.getCode())) { + if (userRoleIds.contains(UserRoleEnum.DESIGN_CUSTOMER.getCode()) && userRoleIds.contains(UserRoleEnum.HEAD_OF_DESIGN.getCode())) { PageHelper.startPage(pageNum, pageSize); return decorationMeasureDAO.getShopIdListByDesignUserIdOrQuotationAndShopStage(user.getUserId()); } @@ -484,7 +486,7 @@ public class DeskServiceImpl implements DeskService { vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime()); } } else if (vo.getSubStageStatus().equals(SHOP_SUB_STAGE_STATUS_111.getShopSubStageStatus())) { - vo.setSubmitTime(DateUtils.parseDateToStr( SPECIAL_DATE_START,constructionMap.get(vo.getShopId()))); + vo.setSubmitTime(DateUtils.parseDateToStr(SPECIAL_DATE_START, constructionMap.get(vo.getShopId()))); } } @@ -672,13 +674,16 @@ public class DeskServiceImpl implements DeskService { preparationCommonPendingVO.setShopId(x.getShopId()); ShopInfoDO shopInfoDO = shopInfoMap.getOrDefault(x.getShopId(), new ShopInfoDO()); preparationCommonPendingVO.setStoreType(shopInfoDO.getStoreType()); - if (shopInfoDO != null) { + if (StringUtil.isNotEmpty(shopInfoDO.getDetailAddress())) { + preparationCommonPendingVO.setShopAddress(shopInfoDO.getDetailAddress()); + } else { PointInfoDO pointInfoDO = pointMap.get(shopInfoDO.getPointId()); if (pointInfoDO != null) { preparationCommonPendingVO.setShopAddress(pointInfoDO.getAddress()); } - preparationCommonPendingVO.setShopCode(shopInfoDO.getShopCode()); } + preparationCommonPendingVO.setShopCode(shopInfoDO.getShopCode()); + preparationCommonPendingVO.setJoinMode(shopInfoDO.getJoinMode()); preparationCommonPendingVO.setInvestmentManager(lineMap.getOrDefault(x.getLineId(), new PlanLineDTO()).getInvestmentManagerName()); preparationCommonPendingVO.setStage(x.getShopStage()); preparationCommonPendingVO.setSubStage(x.getShopSubStage()); @@ -746,13 +751,10 @@ public class DeskServiceImpl implements DeskService { operationLogDOList.forEach(x -> { PreparationCommonPendingVO preparationCommonPendingVO = new PreparationCommonPendingVO(); ShopInfoDO shopInfoDO = shopInfoMap.getOrDefault(x.getShopId(), new ShopInfoDO()); - if (shopInfoDO != null) { - PointInfoDO pointInfoDO = pointMap.get(shopInfoDO.getPointId()); - if (pointInfoDO != null) { - preparationCommonPendingVO.setShopAddress(pointInfoDO.getAddress()); - } - preparationCommonPendingVO.setShopCode(shopInfoDO.getShopCode()); - } + preparationCommonPendingVO.setStoreType(shopInfoDO.getStoreType()); + preparationCommonPendingVO.setJoinMode(shopInfoDO.getJoinMode()); + preparationCommonPendingVO.setShopAddress(shopInfoDO.getDetailAddress()); + preparationCommonPendingVO.setShopCode(shopInfoDO.getShopCode()); preparationCommonPendingVO.setLineId(shopInfoDO.getLineId()); preparationCommonPendingVO.setShopId(x.getShopId()); preparationCommonPendingVO.setSubStage(x.getShopSubStage());