feat：切换门店企业id 重置

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/StaffDTO.java

@@ -96,6 +96,7 @@ public class StaffDTO implements Serializable {
 
 	private String wxOpenId;
 	private String qrCode;
+	private String clerkName;
 
 	public String getClerkId() {
 		return clerkId;
@@ -347,4 +348,12 @@ public class StaffDTO implements Serializable {
 	public void setQrCode(String qrCode) {
 		this.qrCode = qrCode;
 	}
+
+	public String getClerkName() {
+		return clerkName;
+	}
+
+	public void setClerkName(String clerkName) {
+		this.clerkName = clerkName;
+	}
 }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/LoginController.java

@@ -296,6 +296,7 @@ public class LoginController extends WebBaseController {
         ClerkDTO clerk = clerkService.getClerkByPhoneNumber(loginPhoneNumber, gicEnterpriseId);
         if (clerk != null) {
             staff.setClerkId(clerk.getClerkId());
+            staff.setClerkName(clerk.getClerkName());
             staff.setClerkCode(clerk.getClerkCode());
         }
         loginDTO.setStaffDTO(staff);

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseController.java

@@ -299,6 +299,7 @@ public class WxEnterpriseController extends WebBaseController {
 
     /**
      * 微信企业绑定接口绑定通讯录key
+     *
      * @param contactSecret
      * @return
      */
@@ -339,6 +340,7 @@ public class WxEnterpriseController extends WebBaseController {
 
     /**
      * 微信企业绑定接口绑定通讯录key
+     *
      * @param wxSecretKey
      * @return
      */
@@ -372,6 +374,7 @@ public class WxEnterpriseController extends WebBaseController {
 
     /**
      * 微信企业会员小程序
+     *
      * @param memberSecret
      * @param enterpriseId
      * @param secretName
@@ -428,6 +431,7 @@ public class WxEnterpriseController extends WebBaseController {
 
     /**
      * 微信企业绑定接口绑定通讯录key(好办助手)
+     *
      * @param contactSecret
      * @param memberSecret
      * @return
@@ -474,6 +478,7 @@ public class WxEnterpriseController extends WebBaseController {
 
     /**
      * 企微相关密钥列表
+     *
      * @return
      */
     @RequestMapping("secret-list")
@@ -510,22 +515,29 @@ public class WxEnterpriseController extends WebBaseController {
         return resultResponse(HaoBanErrCode.ERR_1, b);
     }
 
-    //企业信息
+    /**
+     * 判断企业是否过期
+     *
+     * @param enterpriseId
+     * @return
+     */
     @RequestMapping("enterprise-is-over")
     public HaobanResponse enterpriseIsOver(String enterpriseId) {
         if (StringUtils.isEmpty(enterpriseId)) {
             return resultResponse(HaoBanErrCode.ERR_2);
         }
-        EnterpriseDTO enterprise = enterpriseService.getEnterpriseById(enterpriseId);
-        logger.info("enterprise={}", JSON.toJSONString(enterprise));
-        if (enterprise == null || enterprise.getExpireTime() == null || enterprise.getEnabledState() == null) {
-            return resultResponse(HaoBanErrCode.ERR_1, false);
+        boolean flag = wxEnterpriseApiService.enterpriseIsOver(enterpriseId);
+        //切换企业 更新token中的企业id
+        if (!flag) {
+            String token = AuthWebRequestUtil.getToken();
+            WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
+            if (loginUser != null) {
+                loginUser.setEnterpriseId(enterpriseId);
+                AuthWebRequestUtil.setSessionUser(loginUser);
+                AuthWebRequestUtil.setAppLoginUser(token, loginUser);
             }
-        if (enterprise.getExpireTime().getTime() > System.currentTimeMillis() && enterprise.getEnabledState() == 1) {
-            return resultResponse(HaoBanErrCode.ERR_1, false);
         }
-        logger.info("【返回类型】overFlag={}", true);
-        return resultResponse(HaoBanErrCode.ERR_1, true);
+        return resultResponse(HaoBanErrCode.ERR_1, flag);
     }
 
     /**