diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java index 54430c798..81cc40a28 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java @@ -311,7 +311,12 @@ public class SysLoginController { vo.setCurrentMenuTreeNodes(BeanUtil.copyToList(menuService.getMenuTree(currentMenus), MenuTreeNodeVO.class)); //当前档口 - vo.setCurrentStoreId(roleInfoVO.getRelStoreId()); + Long storeId = roleInfoVO.getRelStoreId(); + vo.setCurrentStoreId(storeId); + if (storeId != null) { + //档口状态 + vo.setCurrentStoreStatus(storeService.getStoreStatus(storeId)); + } } } return vo; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/vo/UserLoginInfoVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/vo/UserLoginInfoVO.java index 23b6fa903..b3950dc8d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/vo/UserLoginInfoVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/vo/UserLoginInfoVO.java @@ -28,4 +28,7 @@ public class UserLoginInfoVO extends UserInfoVO { @ApiModelProperty("当前档口ID") private Long currentStoreId; + @ApiModelProperty("当前档口状态[1:待审核 2:审核驳回 3:试用期 4:正式使用 5:强制清退 null:未认证]") + private Integer currentStoreStatus; + } diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreService.java b/xkt/src/main/java/com/ruoyi/xkt/service/IStoreService.java index 8ccf0dad9..78a9dff39 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreService.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/IStoreService.java @@ -173,4 +173,12 @@ public interface IStoreService { * @return StoreIndexTodaySaleResDTO */ StoreIndexTodaySaleTop5ResDTO indexTodayProdSaleRevenueTop5(Long storeId); + + /** + * 档口状态 + * + * @param storeId + * @return + */ + Integer getStoreStatus(Long storeId); } diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java index 456f1ee7a..f672de56d 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java @@ -361,6 +361,12 @@ public class StoreServiceImpl implements IStoreService { return new StoreIndexTodaySaleTop5ResDTO().setStoreId(storeId).setOtherAmount(otherAmount).setSaleList(top5List); } + @Transactional(readOnly = true) + @Override + public Integer getStoreStatus(Long storeId) { + return Optional.ofNullable(storeMapper.selectById(storeId)).map(Store::getStoreStatus).orElse(null); + } + /** * 档口首页今日销售额 *