From 36a7365811ee7f79935052fe7701c248c6c60a27 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Fri, 19 Apr 2024 14:58:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8E=B7=E5=8F=96=E4=BA=BA?= =?UTF-8?q?=E7=9A=84=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/enums/point/ShopStageEnum.java | 3 ++- .../java/com/cool/store/service/SysRoleService.java | 11 ++++++++++- .../com/cool/store/service/impl/PointServiceImpl.java | 4 ++-- .../cool/store/service/impl/SysRoleServiceImpl.java | 5 +++++ 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopStageEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopStageEnum.java index 5f178398e..dbdb39bd4 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopStageEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopStageEnum.java @@ -11,7 +11,8 @@ public enum ShopStageEnum { //1选址 2筹建 3开业 SHOP_STAGE_1(1, "选址"), SHOP_STAGE_2(2, "筹建"), - SHOP_STAGE_3(3, "开业"), + SHOP_STAGE_3(3, "开业验收"), + SHOP_STAGE_4(4, "新店开业"), ; //店铺阶段 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/SysRoleService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/SysRoleService.java index 215ff08e0..432503a44 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/SysRoleService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/SysRoleService.java @@ -1,5 +1,8 @@ package com.cool.store.service; +import com.cool.store.enums.UserRoleEnum; + +import java.util.List; import java.util.Map; public interface SysRoleService { @@ -8,5 +11,11 @@ public interface SysRoleService { Map getXfsgRoles(); - + /** + * 根据区域 和 角色优先级(优先取第一个角色 没有用户取第二个角色，以此类推)获取一个用户 + * @param regionId + * @param roleList + * @return + */ + String getUserIdByRegionIdWithRolePriority(Long regionId, List roleList); } 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 970484bd4..8e82a1909 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 @@ -829,13 +829,13 @@ public class PointServiceImpl implements PointService { updatePoint.setId(shopInfo.getPointId()); updatePoint.setPointStatus(PointStatusEnum.POINT_STATUS_6.getCode()); pointInfoDAO.updatePointInfo(updatePoint); - //系统筹建初始化 TODO shopStageInfoDAO.updateShopStageInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_30); shopStageInfoDAO.updateShopStageInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_40); ShopInfoDO updateShop = new ShopInfoDO(); updateShop.setId(shopId); updateShop.setShopStage(ShopStageEnum.SHOP_STAGE_2.getShopStage()); - updateShop.setShopManagerUserId(null); + List roleList = Arrays.asList(UserRoleEnum.THEATER_MANAGER, UserRoleEnum.OPERATIONS_MANAGER, UserRoleEnum.REGION_MANAGER); + updateShop.setShopManagerUserId(sysRoleService.getUserIdByRegionIdWithRolePriority(shopInfo.getRegionId(), roleList)); shopInfoDAO.updateShopInfo(updateShop); } return shopStageInfoDAO.updateShopStageAndAuditInfo(shopId, subStageStatus, auditId); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysRoleServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysRoleServiceImpl.java index 2c30e803d..fe209742b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysRoleServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysRoleServiceImpl.java @@ -48,5 +48,10 @@ public class SysRoleServiceImpl implements SysRoleService { return sysRoleDOMap; } + @Override + public String getUserIdByRegionIdWithRolePriority(Long regionId, List roleList) { + return null; + } + }