| | |
| | | authUser.setUsername(userDto.getUsername()); |
| | | break; |
| | | case NEW: |
| | | jsonObject = weiXinService.getPhoneNumber(authUser.getCode()); |
| | | jsonObject = weiXinService.getRiderPhoneNumber(authUser.getCode()); |
| | | String phone = jsonObject.getJSONObject("phone_info").getString("purePhoneNumber"); |
| | | User user1 = userService.findByName(phone); |
| | | if (user1 == null) { |
| | |
| | | User user = new User(); |
| | | user.setUsername(phone); |
| | | user.setNickName("OYING-" + phone); |
| | | user.setUserType(ConstantsKey.RIDER); |
| | | user.setUserType(ConstantsKey.BUYER); |
| | | user.setPhone(phone); |
| | | user.setGender("男"); |
| | | user.setEnabled(true); |
| | | getRole(user); |
| | | user.setPassword(passwordEncoder.encode(phone.substring(phone.length() - 6))); |
| | | user.setOpenid(authUser.getUsername()); |
| | | user.setRiderOpenId(authUser.getUsername()); |
| | | userService.create(user); |
| | | } else { |
| | | if (user1.getUserType().equals(ConstantsKey.RIDER)) { |
| | | if (user1.getUserType().equals(ConstantsKey.BUYER)) { |
| | | if (user1.getRoles() == null) { |
| | | getRole(user1); |
| | | } |
| | | } |
| | | user1.setOpenid(authUser.getUsername()); |
| | | userService.update(user1); |
| | | user1.setRiderOpenId(authUser.getUsername()); |
| | | // userService.update(user1); |
| | | userService.updateRiderOpenId(user1); |
| | | } |
| | | authUser.setUsername(phone); |
| | | break; |