From e672c490a9c2a86bbb22112aaf8beb1d257b10f7 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Thu, 18 Apr 2024 14:17:29 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8A=B6=E6=80=81code=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/enums/point/ShopSubStageEnum.java | 14 ++- .../enums/point/ShopSubStageStatusEnum.java | 95 +++++++++++-------- .../store/service/impl/PointServiceImpl.java | 39 ++++---- 3 files changed, 85 insertions(+), 63 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 882c11e16..d20d87466 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 @@ -21,8 +21,12 @@ public enum ShopSubStageEnum { 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_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), ; //阶段 @@ -77,11 +81,11 @@ public enum ShopSubStageEnum { public ShopSubStageStatusEnum getInitStatus() { switch (this){ case SHOP_STAGE_1: - return ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_0; + return ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_10; case SHOP_STAGE_5: - return ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_14; + return ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_50; case SHOP_STAGE_7: - return ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_18; + return ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_70; case SHOP_STAGE_2: case SHOP_STAGE_3: case SHOP_STAGE_4: 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 c409c19c8..980e6b138 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 @@ -15,63 +15,82 @@ 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), + SHOP_SUB_STAGE_STATUS_10(ShopSubStageEnum.SHOP_STAGE_1, 100, "待选址", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_11(ShopSubStageEnum.SHOP_STAGE_1, 110, "已选址", Boolean.TRUE), //上传租赁合同 - SHOP_SUB_STAGE_STATUS_2(ShopSubStageEnum.SHOP_STAGE_2, 200, "待上传", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_3(ShopSubStageEnum.SHOP_STAGE_2, 210, "已上传", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_4(ShopSubStageEnum.SHOP_STAGE_2, 220, "审核未通过", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_5(ShopSubStageEnum.SHOP_STAGE_2, 230, "审核通过", Boolean.TRUE), + SHOP_SUB_STAGE_STATUS_20(ShopSubStageEnum.SHOP_STAGE_2, 200, "待上传", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_21(ShopSubStageEnum.SHOP_STAGE_2, 210, "已上传", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_22(ShopSubStageEnum.SHOP_STAGE_2, 220, "审核未通过", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_23(ShopSubStageEnum.SHOP_STAGE_2, 230, "审核通过", Boolean.TRUE), //系统建店 - SHOP_SUB_STAGE_STATUS_6(ShopSubStageEnum.SHOP_STAGE_3, 300, "待建店", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_7(ShopSubStageEnum.SHOP_STAGE_3, 310, "审核中", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_8(ShopSubStageEnum.SHOP_STAGE_3, 320, "未通过", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_9(ShopSubStageEnum.SHOP_STAGE_3, 330, "已通过", Boolean.TRUE), + SHOP_SUB_STAGE_STATUS_30(ShopSubStageEnum.SHOP_STAGE_3, 300, "待建店", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_31(ShopSubStageEnum.SHOP_STAGE_3, 310, "审核中", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_32(ShopSubStageEnum.SHOP_STAGE_3, 320, "未通过", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_33(ShopSubStageEnum.SHOP_STAGE_3, 330, "已通过", Boolean.TRUE), //证照办理 - SHOP_SUB_STAGE_STATUS_10(ShopSubStageEnum.SHOP_STAGE_4, 400, "待提交", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_11(ShopSubStageEnum.SHOP_STAGE_4, 410, "待审核", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_12(ShopSubStageEnum.SHOP_STAGE_4, 420, "审核未通过", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_13(ShopSubStageEnum.SHOP_STAGE_4, 430, "审核通过", Boolean.TRUE), + SHOP_SUB_STAGE_STATUS_40(ShopSubStageEnum.SHOP_STAGE_4, 400, "待提交", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_41(ShopSubStageEnum.SHOP_STAGE_4, 410, "待审核", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_42(ShopSubStageEnum.SHOP_STAGE_4, 420, "审核未通过", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_43(ShopSubStageEnum.SHOP_STAGE_4, 430, "审核通过", Boolean.TRUE), - //员工招聘 - SHOP_SUB_STAGE_STATUS_14(ShopSubStageEnum.SHOP_STAGE_5, 500, "招聘中", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_15(ShopSubStageEnum.SHOP_STAGE_5, 510, "已完成", Boolean.TRUE), + //培训登记 + SHOP_SUB_STAGE_STATUS_50(ShopSubStageEnum.SHOP_STAGE_5, 500, "登记中", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_51(ShopSubStageEnum.SHOP_STAGE_5, 510, "已完成", Boolean.TRUE), //加盟商/员工培训 - SHOP_SUB_STAGE_STATUS_16(ShopSubStageEnum.SHOP_STAGE_6, 600, "培训中", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_17(ShopSubStageEnum.SHOP_STAGE_6, 610, "已完成", Boolean.TRUE), + SHOP_SUB_STAGE_STATUS_60(ShopSubStageEnum.SHOP_STAGE_6, 600, "培训中", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_61(ShopSubStageEnum.SHOP_STAGE_6, 610, "已完成", Boolean.TRUE), //缴纳加盟费/保证金 - SHOP_SUB_STAGE_STATUS_18(ShopSubStageEnum.SHOP_STAGE_7, 700, "待缴费", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_19(ShopSubStageEnum.SHOP_STAGE_7, 710, "已缴费", Boolean.TRUE), - SHOP_SUB_STAGE_STATUS_20(ShopSubStageEnum.SHOP_STAGE_7, 720, "缴费失败", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_70(ShopSubStageEnum.SHOP_STAGE_7, 700, "待发布账单", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_71(ShopSubStageEnum.SHOP_STAGE_7, 710, "待缴费", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_72(ShopSubStageEnum.SHOP_STAGE_7, 720, "待审核", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_73(ShopSubStageEnum.SHOP_STAGE_7, 730, "已缴费", Boolean.TRUE), + SHOP_SUB_STAGE_STATUS_74(ShopSubStageEnum.SHOP_STAGE_7, 740, "缴费失败", Boolean.FALSE), //加盟合同签约 - SHOP_SUB_STAGE_STATUS_21(ShopSubStageEnum.SHOP_STAGE_8, 800, "待提交", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_22(ShopSubStageEnum.SHOP_STAGE_8, 810, "信息核对", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_23(ShopSubStageEnum.SHOP_STAGE_8, 820, "待加盟商签约", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_24(ShopSubStageEnum.SHOP_STAGE_8, 830, "审核中", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_25(ShopSubStageEnum.SHOP_STAGE_8, 840, "已签约", Boolean.TRUE), - SHOP_SUB_STAGE_STATUS_26(ShopSubStageEnum.SHOP_STAGE_8, 850, "退回", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_80(ShopSubStageEnum.SHOP_STAGE_8, 800, "待提交", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_81(ShopSubStageEnum.SHOP_STAGE_8, 810, "信息核对", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_82(ShopSubStageEnum.SHOP_STAGE_8, 820, "待加盟商签约", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_83(ShopSubStageEnum.SHOP_STAGE_8, 830, "审核中", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_84(ShopSubStageEnum.SHOP_STAGE_8, 840, "已签约", Boolean.TRUE), + SHOP_SUB_STAGE_STATUS_85(ShopSubStageEnum.SHOP_STAGE_8, 850, "退回", Boolean.FALSE), //设计阶段 - SHOP_SUB_STAGE_STATUS_27(ShopSubStageEnum.SHOP_STAGE_9, 900, "进行中", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_28(ShopSubStageEnum.SHOP_STAGE_9, 910, "已完成", Boolean.TRUE), + SHOP_SUB_STAGE_STATUS_90(ShopSubStageEnum.SHOP_STAGE_9, 900, "进行中", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_91(ShopSubStageEnum.SHOP_STAGE_9, 910, "已完成", Boolean.TRUE), + + //装修款 + SHOP_SUB_STAGE_STATUS_100(ShopSubStageEnum.SHOP_STAGE_10, 1000, "待缴费", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_101(ShopSubStageEnum.SHOP_STAGE_10, 1010, "待审批", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_102(ShopSubStageEnum.SHOP_STAGE_10, 1020, "已缴费", Boolean.TRUE), //施工阶段 - SHOP_SUB_STAGE_STATUS_32(ShopSubStageEnum.SHOP_STAGE_10, 1000, "待施工", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_33(ShopSubStageEnum.SHOP_STAGE_10, 1010, "施工中", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_34(ShopSubStageEnum.SHOP_STAGE_10, 1020, "已完成", Boolean.TRUE), + SHOP_SUB_STAGE_STATUS_110(ShopSubStageEnum.SHOP_STAGE_11, 1100, "待施工", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_111(ShopSubStageEnum.SHOP_STAGE_11, 1110, "施工中", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_112(ShopSubStageEnum.SHOP_STAGE_11, 1120, "已完成", Boolean.TRUE), //三方验收 - SHOP_SUB_STAGE_STATUS_35(ShopSubStageEnum.SHOP_STAGE_11, 1100, "待预约", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_36(ShopSubStageEnum.SHOP_STAGE_11, 1110, "待确认", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_37(ShopSubStageEnum.SHOP_STAGE_11, 1120, "待验收", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_38(ShopSubStageEnum.SHOP_STAGE_11, 1130, "验收中", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_39(ShopSubStageEnum.SHOP_STAGE_11, 1140, "已验收", Boolean.TRUE), + SHOP_SUB_STAGE_STATUS_120(ShopSubStageEnum.SHOP_STAGE_12, 1200, "待预约", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_121(ShopSubStageEnum.SHOP_STAGE_12, 1210, "待验收", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_122(ShopSubStageEnum.SHOP_STAGE_12, 1220, "验收中", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_123(ShopSubStageEnum.SHOP_STAGE_12, 1230, "已验收", Boolean.TRUE), + + //视觉验收 + SHOP_SUB_STAGE_STATUS_130(ShopSubStageEnum.SHOP_STAGE_13, 1300, "待验收", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_131(ShopSubStageEnum.SHOP_STAGE_13, 1310, "验收不通过", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_132(ShopSubStageEnum.SHOP_STAGE_13, 1320,"验收通过", Boolean.TRUE), + + //开业运营方案 + SHOP_SUB_STAGE_STATUS_140(ShopSubStageEnum.SHOP_STAGE_14, 1400, "待上传", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_141(ShopSubStageEnum.SHOP_STAGE_14, 1410, "已完成", Boolean.TRUE), + + //首批订货清单 + SHOP_SUB_STAGE_STATUS_150(ShopSubStageEnum.SHOP_STAGE_15, 1500, "待上传", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_151(ShopSubStageEnum.SHOP_STAGE_15, 1510, "已完成", Boolean.TRUE), ; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java index c5b5b8dca..6983f5155 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java @@ -14,7 +14,6 @@ import com.cool.store.service.*; import com.cool.store.utils.RedisUtilPool; import com.cool.store.utils.poi.StringUtils; import com.cool.store.vo.AuditInfoVO; -import com.cool.store.vo.LineAuditInfoVO; import com.cool.store.vo.LinePointBaseInfoVO; import com.cool.store.vo.point.*; import com.github.pagehelper.Page; @@ -174,7 +173,7 @@ public class PointServiceImpl implements PointService { private void rollbackSelectPoint(Long shopId){ shopInfoDAO.unbindPoint(shopId); //回到待选址状态 - shopStageInfoDAO.updateShopStageInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_0); + shopStageInfoDAO.updateShopStageInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_10); //租赁合同回到未开始 Integer result = shopStageInfoDAO.updateShopStageToNotStarted(shopId, ShopSubStageEnum.SHOP_STAGE_2); if(result > CommonConstants.ZERO){ @@ -341,7 +340,7 @@ public class PointServiceImpl implements PointService { //没有下一节点 审批通过 updatePoint.setPointStatus(PointStatusEnum.POINT_STATUS_5.getCode()); if(SelectStatusEnum.SELECT_STATUS_1.getCode().equals(pointInfo.getSelectStatus())){ - shopStageInfoDAO.updateShopStageInfo(pointInfo.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_2); + shopStageInfoDAO.updateShopStageInfo(pointInfo.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_20); } } return pointInfoDAO.updatePointInfo(updatePoint); @@ -399,7 +398,7 @@ public class PointServiceImpl implements PointService { pointInfoUpdate.setId(pointId); pointInfoUpdate.setPointStatus(PointStatusEnum.POINT_STATUS_5.getCode()); if(SelectStatusEnum.SELECT_STATUS_1.getCode().equals(pointInfo.getSelectStatus())){ - shopStageInfoDAO.updateShopStageInfo(pointInfo.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_2); + shopStageInfoDAO.updateShopStageInfo(pointInfo.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_20); } return pointInfoDAO.updatePointInfo(pointInfoUpdate); } @@ -660,7 +659,7 @@ public class PointServiceImpl implements PointService { updateShop.setId(shopId); updateShop.setPointId(pointId); shopInfoDAO.updateShopInfo(shopInfo); - shopStageInfoDAO.updateShopStageInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_1); + shopStageInfoDAO.updateShopStageInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_11); PointDetailInfoDO updateDetail = new PointDetailInfoDO(); updateDetail.setPointId(pointId); updateDetail.setLineSign(request.getLineSign()); @@ -668,7 +667,7 @@ public class PointServiceImpl implements PointService { pointDetailInfoDAO.updatePointDetailInfo(updateDetail); //如果铺位是已审核 则进入上传租赁合同状态 if(PointStatusEnum.POINT_STATUS_5.getCode().equals(pointInfo.getPointStatus())){ - shopStageInfoDAO.updateShopStageInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_2); + shopStageInfoDAO.updateShopStageInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_20); } return pointRecommendDAO.updateStatusByPointIdAndLineId(pointId, lineId); } catch (ServiceException e) { @@ -692,6 +691,11 @@ public class PointServiceImpl implements PointService { if(Objects.isNull(lineInfo)){ throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST); } + List shopList = shopInfoDAO.getShopList(lineId); + List unSelectShopIds = shopList.stream().filter(o -> o.getShopStage().equals(ShopStageEnum.SHOP_STAGE_1.getShopStage())).filter(o -> Objects.isNull(o.getPointId())).map(ShopInfoDO::getId).collect(Collectors.toList()); + if(CollectionUtils.isEmpty(unSelectShopIds)){ + throw new ServiceException(ErrorCodeEnum.NOT_EXIST_UNSELECT_POINT); + } PointDetailInfoDO pointDetailInfo = MiniAddPointRequest.convertDO(request); PointInfoDO pointInfo = MiniAddPointRequest.convertPointDO(request); pointInfo.setRegionId(lineInfo.getRegionId()); @@ -704,11 +708,6 @@ public class PointServiceImpl implements PointService { Long pointId = pointInfoDAO.addPointInfo(pointInfo); pointDetailInfo.setPointId(pointId); pointDetailInfoDAO.addPointDetailInfo(pointDetailInfo); - List shopList = shopInfoDAO.getShopList(lineId); - List unSelectShopIds = shopList.stream().filter(o -> o.getShopStage().equals(ShopStageEnum.SHOP_STAGE_1.getShopStage())).filter(o -> Objects.isNull(o.getPointId())).map(ShopInfoDO::getId).collect(Collectors.toList()); - if(CollectionUtils.isEmpty(unSelectShopIds)){ - throw new ServiceException(ErrorCodeEnum.NOT_EXIST_UNSELECT_POINT); - } //门店占铺 Integer result = shopInfoDAO.occupyShopPoint(unSelectShopIds, pointId); if(result != CommonConstants.ONE){ @@ -728,7 +727,7 @@ public class PointServiceImpl implements PointService { //推荐列表新增 pointRecommendDAO.addRecommendPoint(Lists.newArrayList(pointRecommendDO)); //更新店铺所处阶段 - shopStageInfoDAO.updateShopStageInfo(shopInfo.getId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_1); + shopStageInfoDAO.updateShopStageInfo(shopInfo.getId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_11); PointInfoDO updatePoint = new PointInfoDO(); updatePoint.setId(pointId); updatePoint.setShopId(shopInfo.getId()); @@ -745,7 +744,7 @@ public class PointServiceImpl implements PointService { if(Objects.isNull(shopSubStageInfo)){ throw new ServiceException(ErrorCodeEnum.SHOP_STAGE_ERROR); } - if(!shopSubStageInfo.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_2.getShopSubStageStatus())){ + if(!shopSubStageInfo.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_20.getShopSubStageStatus())){ throw new ServiceException(ErrorCodeEnum.SHOP_STAGE_NOT_OPERATE); } Long pointId = request.getPointId(), shopId = request.getShopId(); @@ -761,7 +760,7 @@ public class PointServiceImpl implements PointService { shopRentInfo.setShopId(shopId); shopRentInfo.setPointId(pointId); shopRentInfoDAO.addShopRentInfo(shopRentInfo); - return shopStageInfoDAO.updateShopStageInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_3); + return shopStageInfoDAO.updateShopStageInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_21); } @Override @@ -773,8 +772,8 @@ public class PointServiceImpl implements PointService { ShopRentInfoVO result = ShopRentInfoVO.build(rentContract); ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_2); result.setStatus(shopSubStageInfo.getShopSubStageStatus()); - boolean isAudit = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_4.getShopSubStageStatus().equals(shopSubStageInfo.getShopSubStageStatus()) || - ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_5.getShopSubStageStatus().equals(shopSubStageInfo.getShopSubStageStatus()); + boolean isAudit = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_22.getShopSubStageStatus().equals(shopSubStageInfo.getShopSubStageStatus()) || + ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_23.getShopSubStageStatus().equals(shopSubStageInfo.getShopSubStageStatus()); if(Objects.nonNull(shopSubStageInfo.getAuditId()) && isAudit){ //当前是审核过的状态才获取原因 LineAuditInfoDO auditInfo = lineAuditInfoDAO.getAuditInfo(shopSubStageInfo.getAuditId()); @@ -794,8 +793,8 @@ public class PointServiceImpl implements PointService { throw new ServiceException(ErrorCodeEnum.SHOP_STAGE_NOT_OPERATE); } Long auditId = lineAuditInfoDAO.addAuditInfo(AuditRentContractRequest.convert(request, shopInfo.getPartnerId(), shopInfo.getLineId())); - ShopSubStageStatusEnum subStageStatus = AuditResultTypeEnum.PASS.getCode().equals(request.getResultType()) ? ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_5 : ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_4; - if(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_5.equals(subStageStatus)){ + ShopSubStageStatusEnum subStageStatus = AuditResultTypeEnum.PASS.getCode().equals(request.getResultType()) ? ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_23 : ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_22; + if(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_23.equals(subStageStatus)){ //审核通过铺位变为已签约 PointInfoDO updatePoint = new PointInfoDO(); updatePoint.setId(shopInfo.getPointId()); @@ -813,8 +812,8 @@ public class PointServiceImpl implements PointService { } ShopRentInfoDO shopRentInfo = UpdateRentContractRequest.convertDO(request); ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_2); - if(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_4.getShopSubStageStatus().equals(shopSubStageInfo.getShopSubStageStatus())){ - shopStageInfoDAO.updateShopStageAndAuditInfo(shopRentInfo.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_3, null); + if(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_22.getShopSubStageStatus().equals(shopSubStageInfo.getShopSubStageStatus())){ + shopStageInfoDAO.updateShopStageAndAuditInfo(shopRentInfo.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_21, null); } return shopRentInfoDAO.updateRentContract(shopRentInfo); }