From 3b88a482c547a5210be4a9614804312f595ef643 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 14 May 2025 14:16:31 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=8A=A0=E7=9B=9F=E5=90=88=E5=90=8C?= =?UTF-8?q?=E8=80=81=E5=BA=97=E6=96=B0=E5=BC=80=E8=A3=85=E4=BF=AE=E4=B8=8E?= =?UTF-8?q?=E5=BC=80=E4=B8=9A=E7=9B=B4=E6=8E=A5=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SignFranchiseServiceImpl.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) 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 6b43357e1..f871c50dd 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 @@ -37,6 +37,7 @@ import java.util.*; import java.util.stream.Collectors; import static com.cool.store.enums.UserRoleEnum.*; +import static com.cool.store.enums.point.ShopSubStageStatusEnum.*; @Service @Slf4j @@ -116,7 +117,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu Long shopId = getShopId(request.getKdzBusinessId()); ShopSubStageStatusEnum shopSubStageStatusEnum = null; if (request.getAuditResult() == 1) { - shopSubStageStatusEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_84; + shopSubStageStatusEnum = SHOP_SUB_STAGE_STATUS_84; } else if (request.getAuditResult() == 0) { shopSubStageStatusEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_85; } @@ -331,7 +332,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu Long shopId = request.getShopId(); ShopSubStageStatusEnum shopSubStageStatusEnum = null; if (request.getAuditResult() == 1) { - shopSubStageStatusEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_84; + shopSubStageStatusEnum = SHOP_SUB_STAGE_STATUS_84; } else if (request.getAuditResult() == 0) { shopSubStageStatusEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_85; } @@ -377,6 +378,16 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu shopStageInfoDAO.updateShopStageInfo(shopId, shopSubStageStatusEnum); //初始化数据 preparationService.contractAndBuildStoreCompletion(request.getShopId()); + + //判断是否是老店新开 + SignFranchiseDO signFranchiseDO = signFranchiseMapper.selectByShopId(shopId); + log.info("加盟合同审批时签约类型:{}",SignTypeEnum.getDescByCode(signFranchiseDO.getSignType())); + if (SignTypeEnum.OLD_NEW_OPEN.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 + )); + } commonService.sendSms(lineInfoDO.getMobile(), SMSMsgEnum.SIGN_CONTRACT); HashMap map = new HashMap<>(); map.put("partnerUsername", lineInfoDO.getUsername());