From 497d7b48f53ad4b1a8dc5a65f7282753773dc7a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 9 Oct 2024 15:53:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=E9=98=B6=E6=AE=B5=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enums/point/ShopSubStageStatusEnum.java | 36 ++++--- .../resources/mapper/ApplyLicenseMapper.xml | 3 +- .../cool/store/entity/LicenseTransactDO.java | 6 +- .../store/service/PreparationService.java | 7 ++ .../store/service/impl/PointServiceImpl.java | 1 - .../service/impl/PreparationServiceImpl.java | 64 +++++++++++-- .../impl/SignFranchiseServiceImpl.java | 2 +- .../service/impl/SysStoreAppServiceImpl.java | 96 +++++++++---------- 8 files changed, 136 insertions(+), 79 deletions(-) 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 ab69cebe7..8f94e6704 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 @@ -84,37 +84,35 @@ public enum ShopSubStageStatusEnum { //抖音 SHOP_SUB_STAGE_STATUS_180(ShopSubStageEnum.SHOP_STAGE_18, 1800, "待申请", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_181(ShopSubStageEnum.SHOP_STAGE_18, 1810, "待审核", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_182(ShopSubStageEnum.SHOP_STAGE_18, 1820,"审核不通过", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_183(ShopSubStageEnum.SHOP_STAGE_18, 1830, "已完成", Boolean.TRUE), + SHOP_SUB_STAGE_STATUS_181(ShopSubStageEnum.SHOP_STAGE_18, 1810, "受理中", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_182(ShopSubStageEnum.SHOP_STAGE_18, 1820,"开通失败", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_183(ShopSubStageEnum.SHOP_STAGE_18, 1830, "开通成功", Boolean.TRUE), //美团外卖 SHOP_SUB_STAGE_STATUS_190(ShopSubStageEnum.SHOP_STAGE_19, 1900, "待申请", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_191(ShopSubStageEnum.SHOP_STAGE_19, 1910, "大区总待审核", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_192(ShopSubStageEnum.SHOP_STAGE_19, 1920, "大区总审核不通过", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_193(ShopSubStageEnum.SHOP_STAGE_19, 1930,"总部待审核", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_194(ShopSubStageEnum.SHOP_STAGE_19, 1940,"总部审核不通过", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_195(ShopSubStageEnum.SHOP_STAGE_19, 1950, "已完成", Boolean.TRUE), + SHOP_SUB_STAGE_STATUS_191(ShopSubStageEnum.SHOP_STAGE_19, 1910, "初审中", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_193(ShopSubStageEnum.SHOP_STAGE_19, 1930,"受理中", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_194(ShopSubStageEnum.SHOP_STAGE_19, 1940,"开通失败", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_195(ShopSubStageEnum.SHOP_STAGE_19, 1950, "开通成功", Boolean.TRUE), //美团团购 SHOP_SUB_STAGE_STATUS_200(ShopSubStageEnum.SHOP_STAGE_20, 2000, "待申请", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_201(ShopSubStageEnum.SHOP_STAGE_20, 2010, "待审核", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_202(ShopSubStageEnum.SHOP_STAGE_20, 2020,"审核不通过", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_203(ShopSubStageEnum.SHOP_STAGE_20, 2030, "已完成", Boolean.TRUE), + SHOP_SUB_STAGE_STATUS_201(ShopSubStageEnum.SHOP_STAGE_20, 2010, "受理中", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_202(ShopSubStageEnum.SHOP_STAGE_20, 2020,"开通失败", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_203(ShopSubStageEnum.SHOP_STAGE_20, 2030, "开通成功", Boolean.TRUE), //饿了么 SHOP_SUB_STAGE_STATUS_210(ShopSubStageEnum.SHOP_STAGE_21, 2100, "待申请", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_211(ShopSubStageEnum.SHOP_STAGE_21, 2110, "大区总待审核", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_212(ShopSubStageEnum.SHOP_STAGE_21, 2120, "大区总审核不通过", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_213(ShopSubStageEnum.SHOP_STAGE_21, 2130,"总部待审核", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_214(ShopSubStageEnum.SHOP_STAGE_21, 2140,"总部审核不通过", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_215(ShopSubStageEnum.SHOP_STAGE_21, 2150, "已完成", Boolean.TRUE), + SHOP_SUB_STAGE_STATUS_211(ShopSubStageEnum.SHOP_STAGE_21, 2110, "初审中", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_213(ShopSubStageEnum.SHOP_STAGE_21, 2130,"受理中", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_214(ShopSubStageEnum.SHOP_STAGE_21, 2140,"开通失败", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_215(ShopSubStageEnum.SHOP_STAGE_21, 2150, "开通成功", Boolean.TRUE), //快手 SHOP_SUB_STAGE_STATUS_220(ShopSubStageEnum.SHOP_STAGE_22, 2200, "待申请", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_221(ShopSubStageEnum.SHOP_STAGE_22, 2210, "待审核", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_222(ShopSubStageEnum.SHOP_STAGE_22, 2220,"审核不通过", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_223(ShopSubStageEnum.SHOP_STAGE_22, 2230, "已完成", Boolean.TRUE), + SHOP_SUB_STAGE_STATUS_221(ShopSubStageEnum.SHOP_STAGE_22, 2210, "受理中", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_222(ShopSubStageEnum.SHOP_STAGE_22, 2220,"开通失败", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_223(ShopSubStageEnum.SHOP_STAGE_22, 2230, "开通成功", Boolean.TRUE), ; diff --git a/coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml index c08fa1330..22ab171f5 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml @@ -25,7 +25,8 @@ food_business_start_time, food_business_end_time, food_business_license_url, - remark, + food_license_remark, + business_license_remark, remark_url, submit_status, create_time, diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/LicenseTransactDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/LicenseTransactDO.java index f2d968158..1184222d7 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/LicenseTransactDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/LicenseTransactDO.java @@ -57,10 +57,12 @@ public class LicenseTransactDO { private Date foodBusinessEndTime; @Column(name = "food_business_license_url") private String foodBusinessLicenseUrl; - @Column(name = "remark") - private String remark; + @Column(name = "foodLicenseRemark") + private String foodLicenseRemark; @Column(name = "remark_url") private String remarkUrl; + @Column(name = "businessLicenseRemark") + private String businessLicenseRemark; @Column(name = "submit_status") private Integer submitStatus; @Column(name = "create_time") diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/PreparationService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/PreparationService.java index 246c47b71..518d76dab 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/PreparationService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/PreparationService.java @@ -40,6 +40,13 @@ public interface PreparationService { void contractAndBuildStoreCompletion(Long shopId); + /** + * 证照办理完成 初始化平台建店数据 + * @param shopId + */ + void licenseCompleted(Long shopId); + + /** * 是否开业验收 改走的流程都已经完成 ->初始化开业验收数据 * @param shopId 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 7f9cde7e0..4b6020500 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 @@ -911,7 +911,6 @@ public class PointServiceImpl implements PointService { updatePoint.setId(shopInfo.getPointId()); updatePoint.setPointStatus(PointStatusEnum.POINT_STATUS_6.getCode()); pointInfoDAO.updatePointInfo(updatePoint); - shopStageInfoDAO.batchUpdateShopStageStatus(shopId, Lists.newArrayList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_40)); ShopInfoDO updateShop = new ShopInfoDO(); updateShop.setId(shopId); updateShop.setShopStage(ShopStageEnum.SHOP_STAGE_2.getShopStage()); 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 77880bff9..9bd5b376e 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 @@ -195,14 +195,64 @@ public class PreparationServiceImpl implements PreparationService { Boolean contractCompletionFlag = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_84.getShopSubStageStatus().equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage()).getShopSubStageStatus()); //都完成了 初始化后续流程数据 if (contractCompletionFlag) { - //初始化后续流程数据 设计阶段 装修阶段 开业运营方案 首批订货清单 + //初始化后续流程数据s List list = new ArrayList<>(); - ShopStageInfoDO data1 = shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_9.getShopSubStage()); - data1.setShopSubStageStatus(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_90.getShopSubStageStatus()); - list.add(data1); - ShopStageInfoDO data3 = shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_14.getShopSubStage()); - data3.setShopSubStageStatus(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_140.getShopSubStageStatus()); - list.add(data3); + ShopStageInfoDO data3 = shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_3.getShopSubStage()); + data3.setShopSubStageStatus(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_30.getShopSubStageStatus()); + + ShopStageInfoDO data4 = shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_4.getShopSubStage()); + data4.setShopSubStageStatus(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_40.getShopSubStageStatus()); + + ShopStageInfoDO data9 = shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_9.getShopSubStage()); + data9.setShopSubStageStatus(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_90.getShopSubStageStatus()); + + ShopStageInfoDO data14 = shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_14.getShopSubStage()); + data14.setShopSubStageStatus(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_140.getShopSubStageStatus()); + + ShopStageInfoDO data15 = shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_15.getShopSubStage()); + data15.setShopSubStageStatus(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_150.getShopSubStageStatus()); + + ShopStageInfoDO data16 = shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_16.getShopSubStage()); + data16.setShopSubStageStatus(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_160.getShopSubStageStatus()); + + ShopStageInfoDO data17 = shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_17.getShopSubStage()); + data17.setShopSubStageStatus(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_170.getShopSubStageStatus()); + + list.addAll(Arrays.asList(data3,data4,data14,data15,data16,data17)); + shopStageInfoDAO.batchUpdate(list); + } + } + } + + @Override + public void licenseCompleted(Long shopId) { + List shopStageInfo = shopStageInfoDAO.getShopStageInfo(shopId, null); + if (CollectionUtils.isNotEmpty(shopStageInfo)) { + Map shopStageInfoDOMap = shopStageInfo.stream().collect(Collectors.toMap(ShopStageInfoDO::getShopSubStage, data -> data)); + Boolean flag1 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_33.getShopSubStageStatus(). + 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()); + //都完成了 初始化后续流程数据 + if (flag1&&flag2) { + //初始化后续流程数据s + List list = new ArrayList<>(); + ShopStageInfoDO data18 = shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_18.getShopSubStage()); + data18.setShopSubStageStatus(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_180.getShopSubStageStatus()); + + ShopStageInfoDO data19 = shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_19.getShopSubStage()); + data19.setShopSubStageStatus(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_190.getShopSubStageStatus()); + + ShopStageInfoDO data20 = shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_20.getShopSubStage()); + data20.setShopSubStageStatus(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_200.getShopSubStageStatus()); + + ShopStageInfoDO data21 = shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_21.getShopSubStage()); + data21.setShopSubStageStatus(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_210.getShopSubStageStatus()); + + ShopStageInfoDO data22 = shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_22.getShopSubStage()); + data22.setShopSubStageStatus(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_220.getShopSubStageStatus()); + + list.addAll(Arrays.asList(data18,data19,data20,data21,data22)); shopStageInfoDAO.batchUpdate(list); } } 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 c31542699..e26e92a5a 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 @@ -119,7 +119,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu shopAuditInfoDO.setResultType(Constants.ZERO_INTEGER); shopAuditInfoDO.setPassReason(request.getCause()); //校验建店与加盟签约合同是否完成 并初始化后续流程数据 - preparationService.contractAndBuildStoreCompletion(shopId); + //preparationService.contractAndBuildStoreCompletion(shopId); } shopAuditInfoMapper.insertSelective(shopAuditInfoDO); Long auditId = shopAuditInfoDO.getId(); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java index f3dc30ba8..ff364749c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java @@ -439,54 +439,54 @@ public class SysStoreAppServiceImpl implements SysStoreAppService, AuditResultSe @Override public Boolean auditResult(AuditResultRequest request) { - String kdzBusinessId = request.getKdzBusinessId(); - Long shopId = getShopId(kdzBusinessId); - ShopAuditInfoDO shopAuditInfoDO = new ShopAuditInfoDO(); - ShopSubStageStatusEnum shopSubStageStatusEnum = null; - //1.成功/失败原因 - try { - //删除上次提交数据 - ShopAuditInfoDO deleteShopAuditDo = shopAuditInfoMapper.selectBykeyAndType(shopId); - if (Objects.nonNull(deleteShopAuditDo)){ - deleteShopAuditDo.setDeleted(false); - shopAuditInfoMapper.updateByPrimaryKeySelective(deleteShopAuditDo); - } - //新增本次数据 - shopAuditInfoDO.setShopId(shopId); - shopAuditInfoDO.setAuditType(AuditTypeEnum.SYS_BUILD.getCode()); - shopAuditInfoDO.setSubmittedUserId(""); - shopAuditInfoDO.setSubmittedUserName(""); - if (Constants.ZERO_INTEGER.equals(request.getAuditResult())) { - shopAuditInfoDO.setResultType(Constants.ONE_INTEGER); - shopAuditInfoDO.setRejectReason(request.getCause()); - shopSubStageStatusEnum = null; - } else if (Constants.ONE_INTEGER.equals(request.getAuditResult())) { - ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(shopId); - EnterpriseUserDO supervisor = userAuthMappingService.hierarchicalSearch(UserRoleEnum.SUPERVISION, shopInfoDO.getRegionId()); - shopInfoDO.setStoreNum(request.getStoreNum()); //更新门店编码 - shopInfoDO.setSupervisorUserId(Objects.isNull(supervisor) ? "" : supervisor.getUserId());//更新督导 - SystemBuildingShopDO systemBuildingShopDO = systemBuildingShopMapper.selectOne(SystemBuildingShopDO.builder().shopId(shopId).build()); - if (StringUtils.isEmpty(shopInfoDO.getSupervisorUserId())&&StringUtils.isNotEmpty(systemBuildingShopDO.getSupervisorId())){ - EnterpriseUserDO user = enterpriseUserMapper.getUserInfoByJobnumber(systemBuildingShopDO.getSupervisorId()); - shopInfoDO.setSupervisorUserId(user!=null?user.getUserId():""); - } - shopInfoDO.setShopName(systemBuildingShopDO.getStoreName());//更新铺位名称 - shopInfoMapper.updateByPrimaryKeySelective(shopInfoDO); - shopAuditInfoDO.setResultType(Constants.ZERO_INTEGER); - shopAuditInfoDO.setPassReason(request.getCause()); - shopSubStageStatusEnum = null; - //校验建店与加盟签约合同是否完成 并初始化后续流程数据 - preparationService.contractAndBuildStoreCompletion(shopId); - LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(shopInfoDO.getLineId()); - commonService.sendSms(lineInfoDO.getMobile(), SMSMsgEnum.SYS_BUILD_STORE_DONE); - } - shopAuditInfoMapper.insertSelective(shopAuditInfoDO); - //更新阶段状态 - shopStageInfoDAO.updateShopStageAndAuditInfo(shopId, shopSubStageStatusEnum, shopAuditInfoDO.getId()); - } catch (Exception e) { - log.error("auditResult message:{}",e.getMessage()); - throw new ServiceException(ErrorCodeEnum.UNKNOWN); - } +// String kdzBusinessId = request.getKdzBusinessId(); +// Long shopId = getShopId(kdzBusinessId); +// ShopAuditInfoDO shopAuditInfoDO = new ShopAuditInfoDO(); +// ShopSubStageStatusEnum shopSubStageStatusEnum = null; +// //1.成功/失败原因 +// try { +// //删除上次提交数据 +// ShopAuditInfoDO deleteShopAuditDo = shopAuditInfoMapper.selectBykeyAndType(shopId); +// if (Objects.nonNull(deleteShopAuditDo)){ +// deleteShopAuditDo.setDeleted(false); +// shopAuditInfoMapper.updateByPrimaryKeySelective(deleteShopAuditDo); +// } +// //新增本次数据 +// shopAuditInfoDO.setShopId(shopId); +// shopAuditInfoDO.setAuditType(AuditTypeEnum.SYS_BUILD.getCode()); +// shopAuditInfoDO.setSubmittedUserId(""); +// shopAuditInfoDO.setSubmittedUserName(""); +// if (Constants.ZERO_INTEGER.equals(request.getAuditResult())) { +// shopAuditInfoDO.setResultType(Constants.ONE_INTEGER); +// shopAuditInfoDO.setRejectReason(request.getCause()); +// shopSubStageStatusEnum = null; +// } else if (Constants.ONE_INTEGER.equals(request.getAuditResult())) { +// ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(shopId); +// EnterpriseUserDO supervisor = userAuthMappingService.hierarchicalSearch(UserRoleEnum.SUPERVISION, shopInfoDO.getRegionId()); +// shopInfoDO.setStoreNum(request.getStoreNum()); //更新门店编码 +// shopInfoDO.setSupervisorUserId(Objects.isNull(supervisor) ? "" : supervisor.getUserId());//更新督导 +// SystemBuildingShopDO systemBuildingShopDO = systemBuildingShopMapper.selectOne(SystemBuildingShopDO.builder().shopId(shopId).build()); +// if (StringUtils.isEmpty(shopInfoDO.getSupervisorUserId())&&StringUtils.isNotEmpty(systemBuildingShopDO.getSupervisorId())){ +// EnterpriseUserDO user = enterpriseUserMapper.getUserInfoByJobnumber(systemBuildingShopDO.getSupervisorId()); +// shopInfoDO.setSupervisorUserId(user!=null?user.getUserId():""); +// } +// shopInfoDO.setShopName(systemBuildingShopDO.getStoreName());//更新铺位名称 +// shopInfoMapper.updateByPrimaryKeySelective(shopInfoDO); +// shopAuditInfoDO.setResultType(Constants.ZERO_INTEGER); +// shopAuditInfoDO.setPassReason(request.getCause()); +// shopSubStageStatusEnum = null; +// //校验建店与加盟签约合同是否完成 并初始化后续流程数据 +// preparationService.contractAndBuildStoreCompletion(shopId); +// LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(shopInfoDO.getLineId()); +// commonService.sendSms(lineInfoDO.getMobile(), SMSMsgEnum.SYS_BUILD_STORE_DONE); +// } +// shopAuditInfoMapper.insertSelective(shopAuditInfoDO); +// //更新阶段状态 +// shopStageInfoDAO.updateShopStageAndAuditInfo(shopId, shopSubStageStatusEnum, shopAuditInfoDO.getId()); +// } catch (Exception e) { +// log.error("auditResult message:{}",e.getMessage()); +// throw new ServiceException(ErrorCodeEnum.UNKNOWN); +// } return true; } From 4c7e9449de89b80381e22f59e96ae766d4fb126c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 9 Oct 2024 15:55:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=E9=98=B6=E6=AE=B5=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/request/SubmitLicenseRequest.java | 2 +- .../java/com/cool/store/response/SubmitLicenseResponse.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/SubmitLicenseRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/SubmitLicenseRequest.java index 8aab2848b..daa68a60c 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/SubmitLicenseRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/SubmitLicenseRequest.java @@ -96,7 +96,7 @@ public class SubmitLicenseRequest { licenseTransactDO.setOperator(this.operator); licenseTransactDO.setFoodLicenseLegalPerson(this.foodLicenseLegalPerson); licenseTransactDO.setBusinessProject(this.businessProject); - licenseTransactDO.setRemark(this.remark); + licenseTransactDO.setFoodLicenseRemark(this.remark); licenseTransactDO.setRemarkUrl(this.remarkUrl); licenseTransactDO.setShopId(this.shopId); licenseTransactDO.setBusinessLicense(this.licenseName); diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/SubmitLicenseResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/SubmitLicenseResponse.java index 2804ef5ae..e6d59e3a1 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/SubmitLicenseResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/SubmitLicenseResponse.java @@ -221,7 +221,7 @@ public class SubmitLicenseResponse { submitLicenseResponse.setFoodLicenseLegalPerson(licenseTransactDO.getFoodLicenseLegalPerson()); submitLicenseResponse.setMainBusiness(licenseTransactDO.getMainBusiness()); submitLicenseResponse.setBusinessProject(licenseTransactDO.getBusinessProject()); - submitLicenseResponse.setRemark(licenseTransactDO.getRemark()); + submitLicenseResponse.setRemark(licenseTransactDO.getFoodLicenseRemark()); submitLicenseResponse.setRemarkUrl(licenseTransactDO.getRemarkUrl()); submitLicenseResponse.setSubmitStatus(licenseTransactDO.getSubmitStatus()); submitLicenseResponse.setLicenseUrl(licenseTransactDO.getCreditUrl());