bugfix

lejin · Aug 6, 2018 · 03ca16c · 03ca16c
1 parent f8393c3
commit 03ca16c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/jykcwebapp/src/main/java/org/jesusyouth/jykc/jykcadmin/controller/api/Authenticate.java b/jykcwebapp/src/main/java/org/jesusyouth/jykc/jykcadmin/controller/api/Authenticate.java
@@ -54,10 +54,31 @@ private AuthUser getUserDetails(@RequestParam String email,
  User user;
  if (vip) {
  user = usersRepo.findFirstByPhoneLike(phone);
- user.setVip(true);
+ if(null!=user){
+ user.setVip(true);
+ }
  } else {
  user = usersRepo.findFirstByEmailLikeOrPhoneLike(email, phone);
  }
+ if (null == user && vip) {
+ CommittedMember committedMember = committedMembersRepo.findFirstCommittedMemberByPhoneLike(phone);
+ if (null != committedMember) {
+// committed member login first time
+ User newUser = new User();
+ if(!DEFAULT.equals(phone)){
+ newUser.setPhone(phone);
+ }
+ newUser.setUserId(committedMember.getId());
+ newUser.setZone(committedMember.getZoneId());
+ newUser.setRole("member");
+ newUser.setEmail(committedMember.getEmail());
+ newUser.setName(committedMember.getName());
+ newUser.setVip(true);
+ usersRepo.save(newUser);
+ return convertFromUser(newUser);
+ }
+ return null;
+ }
  if (null == user) {
  CommittedMember committedMember = committedMembersRepo.findFirstCommittedMemberByEmailLikeOrPhoneLike(email, phone);
  if (null != committedMember) {

diff --git a/jykcwebapp/src/main/java/org/jesusyouth/jykc/jykcadmin/repository/CommittedMembersRepo.java b/jykcwebapp/src/main/java/org/jesusyouth/jykc/jykcadmin/repository/CommittedMembersRepo.java
@@ -17,6 +17,8 @@ public interface CommittedMembersRepo extends CrudRepository<CommittedMember,Int
 
  CommittedMember findFirstCommittedMemberByEmailLikeOrPhoneLike(String email , String phone);
 
+ CommittedMember findFirstCommittedMemberByPhoneLike(String phone);
+
  @Modifying
  @Transactional
  @Query(value = "update committed_members set is_group_member=?1 where id=?2",nativeQuery = true)