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());