login

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

@@ -396,33 +396,26 @@ public class LoginController extends WebBaseController {
     }
 
     @RequestMapping("/gic-login-check")
-    public ModelAndView gicLogin(String clerkId, String hbEnt) {
-        logger.info("gic登录clerkId={},hbEnt={}", clerkId, hbEnt);
-        PowerClerkDTO clerkDTO = this.userService.haobanLoginBack(clerkId);
+    public ModelAndView gicLogin(String code, String hbEnt) {
+        logger.info("gic登录clerkId={},hbEnt={}", code, hbEnt);
+        PowerClerkDTO clerkDTO = this.userService.haobanLoginBack(code);
         if (clerkDTO == null) {
-            logger.info("登录失败，code失效：{}", clerkId);
-            ModelAndView model = new ModelAndView(new RedirectView("/haoban-web/#/gic-error", false));
+            logger.info("登录失败,传入clerkId={}无效", code);
+            ModelAndView model = new ModelAndView(new RedirectView("/haoban-web/#/gic-error?errCode=1", false));
             return model;
         }
-        // 获取code信息
         String gicEnterpriseId = clerkDTO.getEnterpriseId();
         String loginPhoneNumber = clerkDTO.getPhoneNumber();
-        boolean b = wxEnterpriseRelatedApiService.enterpriseUseNew(gicEnterpriseId);
-        if (b) {
-            Map<String, String> retMap = new HashMap<>();
-            retMap.put("enterpriseId", gicEnterpriseId);
-            retMap.put("phoneNumber", loginPhoneNumber);
-            retMap.put("wxEnterpriseId", hbEnt);
-            String ret = JSONObject.toJSONString(retMap);
-            AES aes = SecureUtil.aes(LOGIN_KEY.getBytes());
-            String random = aes.encryptHex(ret);
-            logger.info("使用新好办3：{}", random);
-            ModelAndView model = new ModelAndView(
-                    new RedirectView("/haoban-3/#/loginMore?random=" + random, false, false));
-            return model;
-        }
-        logger.info("登录失败，code失效：{}", clerkId);
-        ModelAndView model = new ModelAndView(new RedirectView("/haoban-web/#/gic-error", false));
+        Map<String, String> retMap = new HashMap<>();
+        retMap.put("enterpriseId", gicEnterpriseId);
+        retMap.put("phoneNumber", loginPhoneNumber);
+        retMap.put("wxEnterpriseId", hbEnt);
+        String ret = JSONObject.toJSONString(retMap);
+        AES aes = SecureUtil.aes(LOGIN_KEY.getBytes());
+        String random = aes.encryptHex(ret);
+        logger.info("使用新好办3：{}", random);
+        ModelAndView model = new ModelAndView(
+                new RedirectView("/haoban-3/#/loginMore?random=" + random, false, false));
         return model;
     }