From 9f71a676c5c96451d1acda195db50afc4b467c34 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Thu, 17 Apr 2025 21:47:39 +0800 Subject: [PATCH 1/4] fix --- .../java/com/cool/store/response/BuildInformationResponse.java | 3 +++ .../cool/store/service/impl/BuildInformationServiceImpl.java | 2 ++ 2 files changed, 5 insertions(+) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/BuildInformationResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/BuildInformationResponse.java index f20fa9343..fb651b26c 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/BuildInformationResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/BuildInformationResponse.java @@ -200,4 +200,7 @@ public class BuildInformationResponse { @ApiModelProperty(value = "点餐小程序店铺名称") private String miniProgramsShopName; + + @ApiModelProperty(value = "建店资料当前阶段状态") + private Integer shopSubStageStatus; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java index 84b5d1f39..ea66eab9b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java @@ -66,6 +66,8 @@ public class BuildInformationServiceImpl implements BuildInformationService { throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); } LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfo.getLineId()); + ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_15); + response.setShopSubStageStatus(shopSubStageInfo.getShopSubStageStatus()); response.setUsername(lineInfoDO.getUsername()); response.setShopId(shopId); response.setShopName(shopInfo.getShopName()); From 7bbabdb73939c146d7899bf8f06d279dbd6f37dd Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Thu, 17 Apr 2025 22:06:50 +0800 Subject: [PATCH 2/4] fix --- .../com/cool/store/service/impl/OrderSysInfoServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) 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 657aac648..c6d260d07 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 @@ -74,6 +74,8 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService { OrderSysInfoDO orderSysInfoDO = orderSysInfoDAO.selectByShopId(request.getShopId()); if (Objects.isNull(orderSysInfoDO)) { orderSysInfoDO = new OrderSysInfoDO(); + orderSysInfoDO.setShopId(request.getShopId()); + orderSysInfoDAO.insertSelective(orderSysInfoDO); } ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_15); if (request.getType().equals(OrderSysTypeEnum.ORDER_SYS_TYPE_1.getType())) { From 2348c3cc176ab4a6043b45b534eac5920673178b Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 18 Apr 2025 00:17:28 +0800 Subject: [PATCH 3/4] fix --- .../com/cool/store/service/impl/OrderSysInfoServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 c6d260d07..f593e708c 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 @@ -209,7 +209,8 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService { nextStatus = SHOP_SUB_STAGE_STATUS_156; break; default: - return null; + nextStatus=null; + break; } // if (AuditResultTypeEnum.REJECT.getCode().equals(request.getResultType())) { From e130fcc29aa768fa3163720e70ad2dc7a7f349ca Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 18 Apr 2025 00:24:06 +0800 Subject: [PATCH 4/4] fix --- .../store/service/impl/OrderSysInfoServiceImpl.java | 7 +++++-- .../store/service/impl/PreparationServiceImpl.java | 10 +++++----- 2 files changed, 10 insertions(+), 7 deletions(-) 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 f593e708c..ec61fa740 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 @@ -1,5 +1,6 @@ package com.cool.store.service.impl; +import com.cool.store.constants.CommonConstants; import com.cool.store.context.LoginUserInfo; import com.cool.store.dao.*; import com.cool.store.entity.*; @@ -220,14 +221,16 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService { if (AuditResultTypeEnum.PASS.getCode().equals(request.getResultType())) { //如果加盟费没有优惠阶段直接完成不用总裁审批 if (StringUtils.isNull(franchiseFeeDO.getDiscountReason()) && SHOP_SUB_STAGE_STATUS_154.equals(nowStatus)) { + shopStageInfoDAO.updateShopStageInfo(request.getShopId(), SHOP_SUB_STAGE_STATUS_156); stageCompletion(request.getShopId()); - return shopStageInfoDAO.updateShopStageInfo(request.getShopId(), SHOP_SUB_STAGE_STATUS_156); + return CommonConstants.ONE; } else { + shopStageInfoDAO.updateShopStageInfo(request.getShopId(), nextStatus); if (SHOP_SUB_STAGE_STATUS_156.equals(nextStatus)){ stageCompletion(request.getShopId()); } - return shopStageInfoDAO.updateShopStageInfo(request.getShopId(), nextStatus); + return CommonConstants.ONE; } } return 0; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java index 5be87fa94..886680648 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java @@ -217,7 +217,7 @@ public class PreparationServiceImpl implements PreparationService { List shopStageInfo = shopStageInfoDAO.getShopStageInfo(shopId, null); if (CollectionUtils.isNotEmpty(shopStageInfo)) { Map shopStageInfoDOMap = shopStageInfo.stream().collect(Collectors.toMap(ShopStageInfoDO::getShopSubStage, data -> data)); - Boolean flag3 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_153.getShopSubStageStatus(). + Boolean flag3 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_156.getShopSubStageStatus(). equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_15.getShopSubStage()).getShopSubStageStatus()); if (flag3) { List list = new ArrayList<>(); @@ -239,7 +239,7 @@ public class PreparationServiceImpl implements PreparationService { equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_3.getShopSubStage()).getShopSubStageStatus()); Boolean flag2 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_43.getShopSubStageStatus(). equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_4.getShopSubStage()).getShopSubStageStatus()); - Boolean flag3 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_153.getShopSubStageStatus(). + Boolean flag3 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_156.getShopSubStageStatus(). equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_15.getShopSubStage()).getShopSubStageStatus()); //都完成了 初始化后续流程数据 @@ -312,7 +312,7 @@ public class PreparationServiceImpl implements PreparationService { equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_3.getShopSubStage()).getShopSubStageStatus()); Boolean flag2 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_123.getShopSubStageStatus(). equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_12.getShopSubStage()).getShopSubStageStatus()); - Boolean flag3 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_153.getShopSubStageStatus(). + Boolean flag3 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_156.getShopSubStageStatus(). equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_15.getShopSubStage()).getShopSubStageStatus()); Boolean flag4 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_43.getShopSubStageStatus(). equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_4.getShopSubStage()).getShopSubStageStatus()); @@ -343,7 +343,7 @@ public class PreparationServiceImpl implements PreparationService { Map shopStageInfoDOMap = shopStageInfo.stream().collect(Collectors.toMap(ShopStageInfoDO::getShopSubStage, data -> data)); Boolean flag2 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_12.getShopSubStageStatus(). equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_1.getShopSubStage()).getShopSubStageStatus()); - Boolean flag3 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_153.getShopSubStageStatus(). + Boolean flag3 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_156.getShopSubStageStatus(). equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_15.getShopSubStage()).getShopSubStageStatus()); log.info("selectSiteAndBuildStoreComplete flag2->{} flag3->{}",flag2,flag3); @@ -360,7 +360,7 @@ public class PreparationServiceImpl implements PreparationService { List shopStageInfo = shopStageInfoDAO.getShopStageInfo(shopId, null); if (CollectionUtils.isNotEmpty(shopStageInfo)) { Map shopStageInfoDOMap = shopStageInfo.stream().collect(Collectors.toMap(ShopStageInfoDO::getShopSubStage, data -> data)); - Boolean flag3 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_153.getShopSubStageStatus(). + Boolean flag3 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_156.getShopSubStageStatus(). equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_15.getShopSubStage()).getShopSubStageStatus()); log.info("selectSiteAndBuildStoreComplete flag3->{}",flag3);