From 05f97ef606b8f76ddde60526304235ba53e25d6d Mon Sep 17 00:00:00 2001
From: admin <1752476835@qq.com>
Date: Sun, 9 Jun 2024 16:39:01 +0800
Subject: [PATCH] fix

---
 .../service/impl/PlayClerkUserInfoServiceImpl.java   | 12 +++++++++++-
 .../weichat/entity/PlayClerkUserLoginResponseVo.java | 11 +++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java
index d0110ef..cf4a56e 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java
@@ -118,7 +118,7 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
         if (map.containsKey("3")) {
             result.setAudioAllowEdit(false);
         }
-        //如果存在未审批的申请，或者当前已经是店员
+        //如果存在未审批的申请，或者当前已经是店员-可以申请陪聊
         PlayClerkUserReviewInfoEntity entity = playClerkUserReviewInfoService.queryByClerkId(userInfo.getId(), "0");
         if (entity != null || "1".equals(result.getClerkState())) {
             result.setClerkAllowEdit(false);
@@ -132,6 +132,16 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
         }
         result.setCommodity(playClerkCommodityQueryVos);
         result.setArea(userInfo.getProvince() + "-" + userInfo.getCity());
+        //设置店员是否运行登录
+        if ("0".equals(userInfo.getOnboardingState())) {
+            result.setAllowLogin("1");
+            result.setDisableLoginReason("你已离职，需要复职请联系店铺管理员");
+        }
+        if ("0".equals(userInfo.getListingState())) {
+            result.setAllowLogin("1");
+            result.setDisableLoginReason("你已被下架，没有权限访问");
+        }
+
         return result;
     }
 
diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserLoginResponseVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserLoginResponseVo.java
index e36c55e..84dda1b 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserLoginResponseVo.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserLoginResponseVo.java
@@ -136,4 +136,15 @@ public class PlayClerkUserLoginResponseVo {
     private List<PlayClerkCommodityQueryVo> commodity = new ArrayList<>();
 
 
+    /**
+     * 是否允许登录(0:允许，1:不允许)
+     */
+    private String allowLogin = "0";
+
+    /**
+     * 禁止登录原因
+     */
+    private String disableLoginReason;
+
+
 }