签到功能调整

web/src/main/java/com/jpsoft/education/modules/mobile/controller/RegUserApiController.java

@@ -272,8 +272,8 @@ public class RegUserApiController {
 			 * if (regUser != null && regUser.getUserType().contains("2")) { //教师 } else {
 			 * throw new Exception("该手机号未注册!"); }
 			 */
-            Employee  employee=employeeService.getByPhone(telephone);
-            if(employee==null) {
+            Employee employee = employeeService.getByPhone(telephone);
+            if(employee == null) {
             	messageResult.setResult(false);
                 messageResult.setMessage("该手机号未登记，请联系管理员");
                 return messageResult;
@@ -349,19 +349,8 @@ public class RegUserApiController {
                     regUser.setOpenId(openId);
                     regUser.setUpdateTime(new Date());
                     //regUser.setUserType(userType);
-
                     regUserService.update(regUser);
-                    token = JwtUtil.createToken(jwtSecret, regUser.getId(), DateTime.now().plusHours(6).toDate());
                 } else {
-//                    regUser = regUserService.findByPhone(telephone);
-//                    if(regUser != null){
-//                        //存在账号,家长和老师绑定
-//                        regUser.setOpenId(openId);
-//                        regUser.setUpdateTime(new Date());
-//                        regUser.setUserType(regUser.getUserType() + "," + userType);
-//
-//                        regUserService.update(regUser);
-//                        token = JwtUtil.createToken(jwtSecret, regUser.getId(), DateTime.now().plusHours(6).toDate());
                     regUser = new RegUser();
                     regUser.setId(UUID.randomUUID().toString());
                     regUser.setNickName(nickName);
@@ -373,11 +362,15 @@ public class RegUserApiController {
                     if (StringUtils.isNotEmpty(headImg)) {
                         regUser.setHeadImg(headImg);
                     }
+
                     regUserService.insert(regUser);
-                    employeeService.updateForBindReg(regUser.getId(), telephone);
-                    token = JwtUtil.createToken(jwtSecret, regUser.getId(), DateTime.now().plusHours(6).toDate());
+                }
 
+                if("2".equals(userType)){
+                    employeeService.updateForBindReg(regUser.getId(), telephone);
                 }
+
+                token = JwtUtil.createToken(jwtSecret, regUser.getId(), DateTime.now().plusHours(6).toDate());
             }
 
             Map<String, Object> map = new HashMap<>();