Merge branch 'master-xgh-好办停用' into 'developer'

好办停用

See merge request !226

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

@@ -471,6 +471,11 @@ public class LoginController extends WebBaseController {
             logger.info("切换商户失败,gic账号不存在,eid={},phone={}", enterpriseId, phoneNumber);
             return this.fail("切换商户失败,gic账号不存在");
         }
+        String endMessage = wxEnterpriseApiService.getEndDate(enterpriseId);
+        if (StringUtils.isNotBlank(endMessage)) {
+            logger.info("切换商户失败,商户已过期,eid={},phone={}", enterpriseId, phoneNumber);
+            return this.fail(endMessage);
+        }
         loginUser.setEnterpriseId(enterpriseId);
         loginUser.setClerkId(clerk.getClerkId());
         loginUser.setClerkName(clerk.getClerkName());
@@ -482,11 +487,6 @@ public class LoginController extends WebBaseController {
         loginUser.setClerkPhone(clerk.getPhoneNumber()) ;
         AuthWebRequestUtil.setSessionUser(loginUser);
         AuthWebRequestUtil.setAppLoginUser(token, loginUser);
-        String endMessage = wxEnterpriseApiService.getEndDate(enterpriseId);
-        if (StringUtils.isNotBlank(endMessage)) {
-            logger.info("切换商户失败,商户已过期,eid={},phone={}", enterpriseId, phoneNumber);
-            return this.fail(endMessage);
-        }
         return resultResponse(HaoBanErrCode.ERR_1, false);
     }