From 0f17ecc0c543e2af6cc0f46ff166a0ddbefad328 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Thu, 24 Jul 2025 16:05:09 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E5=BA=97=E8=A3=85=E4=BF=AE=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/enums/ErrorCodeEnum.java | 2 + .../enums/ShopDecorationAttributesEnum.java | 37 +++++++++++++++++++ .../request/AddSignFranchiseRequest.java | 4 ++ .../response/AddSignFranchiseResponse.java | 3 ++ .../service/impl/OrderSysInfoServiceImpl.java | 15 ++++++++ .../impl/SignFranchiseServiceImpl.java | 19 +++------- 6 files changed, 67 insertions(+), 13 deletions(-) create mode 100644 coolstore-partner-common/src/main/java/com/cool/store/enums/ShopDecorationAttributesEnum.java diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index ae9839744..1c69c8f11 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -287,6 +287,8 @@ public enum ErrorCodeEnum { PRODUCTS_DISCARDED(1511034,"产品已报销，无法操作",null), PRODUCTS_SALES_COMPLETED(1511034,"含有销售完成的产品，无法批量报销",null), STORE_IS_EXIST(1511035,"该门店已存在",null), + + SHOP_DECORATION_ATTRIBUTES_IS_NULL(1511036,"门店装修属性为空,请到加盟合同签约阶段填写",null) ; diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ShopDecorationAttributesEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ShopDecorationAttributesEnum.java new file mode 100644 index 000000000..dd9f8bc02 --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ShopDecorationAttributesEnum.java @@ -0,0 +1,37 @@ +package com.cool.store.enums; + +/** + * @Author: WangShuo + * @Date: 2025/07/24/15:54 + * @Version 1.0 + * @注释: + */ +public enum ShopDecorationAttributesEnum { + //0-新开店 1-老店新开 2-老店翻新 3-迁址 + NEW_OPEN(0,"新开店"), + OLD_NEW_OPEN(1,"老店新开"), + RENEWAL(2,"老店翻新"), + RELOCATION(3,"迁址"); + private Integer code; + private String desc; + ShopDecorationAttributesEnum(Integer code, String desc) { + this.code = code; + this.desc = desc; + } + + public Integer getCode() { + return code; + } + + public String getDesc() { + return desc; + } + public static String getDescByCode(Integer code) { + for (ShopDecorationAttributesEnum value : ShopDecorationAttributesEnum.values()) { + if (value.getCode().equals(code)) { + return value.getDesc(); + } + } + return null; + } +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java index 5cf83f78b..0d1fe2cba 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java @@ -145,6 +145,10 @@ public class AddSignFranchiseRequest { @ApiModelProperty("所属管理区域id") private Long managerRegionId; + @ApiModelProperty("门店装修属性 0-新开店 1-老店新开 2-老店翻新 3-迁址") + @NotNull(message = "门店属性（装修）不能为空") + private Integer shopDecorationAttributes; + public SignFranchiseDO toSignFranchiseDO() { diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java index 198b2c297..a51bf8314 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java @@ -235,4 +235,7 @@ public class AddSignFranchiseResponse { @ApiModelProperty("所属管理区域name") private String managerRegionName; + @ApiModelProperty("门店装修属性 0-新开店 1-老店新开 2-老店翻新 3-迁址") + private Integer shopDecorationAttributes; + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java index 1189f781c..54cdc27a7 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java @@ -248,6 +248,7 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService { if (AuditResultTypeEnum.PASS.getCode().equals(request.getResultType())) { //如果不是毛泽军下级大区 直接完成不用总裁审批 if (!flag && SHOP_SUB_STAGE_STATUS_154.equals(nowStatus)) { + updateDecorationStage(request.getShopId()); shopStageInfoDAO.updateShopStageInfo(request.getShopId(), SHOP_SUB_STAGE_STATUS_156); shopStageInfoDAO.updateShopStageInfo(request.getShopId(), SHOP_SUB_STAGE_STATUS_861); stageCompletion(request.getShopId()); @@ -258,6 +259,7 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService { } else { shopStageInfoDAO.updateShopStageInfo(request.getShopId(), nextStatus); if (SHOP_SUB_STAGE_STATUS_156.equals(nextStatus)) { + updateDecorationStage(request.getShopId()); stageCompletion(request.getShopId()); hqtAPIService.pushHqtBuild(getHqtBuildRequest(request.getShopId())); shopStageInfoDAO.updateShopStageInfo(request.getShopId(), SHOP_SUB_STAGE_STATUS_861); @@ -268,6 +270,19 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService { } return 0; } + public void updateDecorationStage(Long shopId){ + ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId); + if (shopInfo.getShopDecorationAttributes() == null){ + throw new ServiceException(ErrorCodeEnum.SHOP_DECORATION_ATTRIBUTES_IS_NULL); + } + if (shopInfo.getShopDecorationAttributes().equals(ShopDecorationAttributesEnum.OLD_NEW_OPEN.getCode())) { + //老店新开时装修与开业直接完成 + shopStageInfoDAO.batchUpdateByShopIdsAndSubStageStatus(Arrays.asList(shopId), Arrays.asList( + SHOP_SUB_STAGE_STATUS_863, SHOP_SUB_STAGE_STATUS_91, SHOP_SUB_STAGE_STATUS_112, SHOP_SUB_STAGE_STATUS_123, SHOP_SUB_STAGE_STATUS_143 + )); + + } + } public HqtBuildRequest getHqtBuildRequest(Long shopId) { ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java index 3ed654a34..bb529d8d6 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java @@ -283,6 +283,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu shopInfoDO.setDistrictCode(request.getDistrictCode()); shopInfoDO.setUpdateTime(new Date()); shopInfoDO.setStoreType(request.getStoreType()); + shopInfoDO.setShopDecorationAttributes(request.getShopDecorationAttributes()); shopInfoMapper.updateByPrimaryKeySelective(shopInfoDO); if (Objects.nonNull(pointInfoById)) { pointInfoById.setProvince(request.getProvince()); @@ -391,18 +392,9 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu //初始化数据 preparationService.contractAndBuildStoreCompletion(request.getShopId()); - //判断是否是老店新开 SignFranchiseDO signFranchiseDO = signFranchiseMapper.selectByShopId(shopId); log.info("加盟合同审批时签约类型:{}", SignTypeEnum.getDescByCode(signFranchiseDO.getSignType())); Boolean sendNotice = Boolean.TRUE; - if (SignTypeEnum.OLD_NEW_OPEN.getCode().equals(signFranchiseDO.getSignType()) || SignTypeEnum.DIRECT_SALES_TO_JOINING.getCode().equals(signFranchiseDO.getSignType())) { - //老店新开时装修与开业直接完成 - shopStageInfoDAO.batchUpdateByShopIdsAndSubStageStatus(Arrays.asList(shopId), Arrays.asList( - SHOP_SUB_STAGE_STATUS_863, SHOP_SUB_STAGE_STATUS_91, SHOP_SUB_STAGE_STATUS_112, SHOP_SUB_STAGE_STATUS_123, SHOP_SUB_STAGE_STATUS_143 - )); - //老店新开 不需要装修与开业 无需发送通知 - sendNotice = Boolean.FALSE; - } commonService.sendSms(lineInfoDO.getMobile(), SMSMsgEnum.SIGN_CONTRACT); if (sendNotice) { HashMap map = new HashMap<>(); @@ -414,10 +406,10 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu if (Objects.nonNull(userDOList)) { finances.addAll(userDOList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); } - List liGuiNeiQinList = enterpriseUserRoleDao.selectUserIdsByRoleIdList(Arrays.asList(UserRoleEnum.CONSTRUCTION_CUSTOMER.getCode())); - commonService.sendQWMessage(liGuiNeiQinList, - MessageEnum.MESSAGE_57, - map); +// List liGuiNeiQinList = enterpriseUserRoleDao.selectUserIdsByRoleIdList(Arrays.asList(UserRoleEnum.CONSTRUCTION_CUSTOMER.getCode())); +// commonService.sendQWMessage(liGuiNeiQinList, +// MessageEnum.MESSAGE_57, +// map); commonService.sendQWMessage(Collections.singletonList(shopInfoDO.getInvestmentManager()), MessageEnum.MESSAGE_26, map); @@ -485,6 +477,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu addSignFranchiseResponse.setCityCode(shopInfoDO.getCityCode()); addSignFranchiseResponse.setDistrictCode(shopInfoDO.getDistrictCode()); addSignFranchiseResponse.setManagerRegionId(shopInfoDO.getManagerRegionId()); + addSignFranchiseResponse.setShopDecorationAttributes(shopInfoDO.getShopDecorationAttributes()); if (Objects.nonNull(managerRegion)){ addSignFranchiseResponse.setManagerRegionName(managerRegion.getName()); }