替换app注册接口

src/main/java/cn/quantgroup/xyqb/controller/external/motan/MotanUserServiceImpl.java

@@ -300,7 +300,6 @@ public class MotanUserServiceImpl implements UserMotanService {
     log.info("第三方用户登录, loginFrom:{}, requestIp:{}", appLoginParam.getRegisterFrom(), requestIp);
     User user = userService.findByPhoneInDb(appLoginParam.getPhoneNo());
     if (user == null) {
-//      user = register(appLoginParam.getRegisterFrom(), appLoginParam.getPhoneNo(), appLoginParam.getIdNo(), appLoginParam.getName(),appLoginParam.getChannelId());
       user = userRegisterService.register(appLoginParam.getRegisterFrom(), appLoginParam.getPhoneNo(), appLoginParam.getIdNo(), appLoginParam.getName(),appLoginParam.getChannelId());
     }
     if (user == null) {
@@ -638,7 +637,6 @@ public class MotanUserServiceImpl implements UserMotanService {
     log.info("第三方用户登录, appLoginParam:{} ", appLoginParam);
     User user = userService.findByPhoneInDb(appLoginParam.getPhoneNo());
     if (user == null) {
-//      user = register(appLoginParam.getRegisterFrom(), appLoginParam.getPhoneNo(), appLoginParam.getIdNo(), appLoginParam.getName(), appLoginParam.getChannelId()); TODO
       user = userRegisterService.register(appLoginParam.getRegisterFrom(), appLoginParam.getPhoneNo(), appLoginParam.getIdNo(), appLoginParam.getName(), appLoginParam.getChannelId());
     }
     if (user == null) {
@@ -768,68 +766,6 @@ public class MotanUserServiceImpl implements UserMotanService {
     return returnValue(t, "");
   }
 
-  /**
-   * 注册新用户
-   *
-   * @return
-   */
-  private User register(Long registerFrom, String phoneNo, String idNo, String name,Long channelId) {
-
-    String randomCode = String.valueOf(random.nextInt(899999) + 100000);
-
-    String uuid = lkbUserService.registerApp(phoneNo, randomCode);
-    Timestamp currentTime = new Timestamp(System.currentTimeMillis());
-
-    log.info("第三方登录用户，保存 User");
-
-    User user = new User();
-    if (channelId == 222L) {
-      user.setRegisteredFrom(channelId);
-    } else {
-      user.setRegisteredFrom(registerFrom);
-    }
-    user.setRegisteredFrom(registerFrom);
-    user.setUuid(uuid);
-    user.setEnable(true);
-    user.setPhoneNo(phoneNo);
-    user.setPassword(PasswordUtil.MD5(randomCode + Constants.PASSWORD_SALT));
-    user.setUpdatedAt(currentTime);
-    user.setCreatedAt(currentTime);
-    userRepository.saveAndFlush(user);
-
-    if (registerFrom != 645L && registerFrom !=900L) {
-      smsService.sendAfterRegister(phoneNo);
-      log.info("第三方登录用户注册成功, registerFrom:{}, phoneNo:{},idNo:{},name:{} 并且已发送短信通知", registerFrom, phoneNo, idNo, name);
-    }else if(registerFrom ==900L){
-      smsService.sendAfterRegister(phoneNo,"123");
-      log.info("第三方(聚美)登录用户注册成功, registerFrom:{}, phoneNo:{},idNo:{},name:{} 并且已发送短信通知", registerFrom, phoneNo, idNo, name);
-    }
-
-    if (StringUtils.isNotBlank(idNo) && StringUtils.isNotBlank(name) && ValidationUtil.validateChinese(name)) {
-      IdCardInfo cardInfo;
-      try {
-        cardInfo = idCardService.getIdCardInfoWithExceptions(idNo);
-
-        UserDetail userDetail = new UserDetail();
-        userDetail.setIdNo(cardInfo.getIdNo());
-        userDetail.setPhoneNo(phoneNo);
-        userDetail.setName(name);
-        userDetail.setIdType(IdType.ID_CARD);
-        userDetail.setCreatedAt(currentTime);
-        userDetail.setUpdatedAt(currentTime);
-        userDetail.setUserId(user.getId());
-        userDetail.setGender(cardInfo.getGender());
-        userDetailService.saveUserDetail(userDetail);
-
-        lkbUserService.userUpdate(user.getUuid(), name, idNo);
-      } catch (Exception e) {
-        log.error("保存 UserDetail 出现异常", e);
-      }
-    }
-
-    return user;
-  }
-
   @Override
   public UserSysResult<XUserDetail> modifyUserDetail(UserDetailUpdateBean userDetailUpdateBean) {
     return returnErrorValue("MotanUserServiceImpl modifyUserDetail(UserDetailUpdateBean userDetailUpdateBean) need to be finish.");

src/main/java/cn/quantgroup/xyqb/controller/external/user/InnerController.java

@@ -919,8 +919,8 @@ public class InnerController implements IBaseController {
       return JsonResult.buildErrorStateResult("用户已存在，手机号被占用", null);
     }
 
-//    user = userService.registerAndReturn(Long.valueOf(registeredFrom), Long.valueOf(channelId), phoneNo, name, idNo, provinceCode, province, cityCode, city, districtCode, district, address, contacts);
-    user = userRegisterService.register(Long.valueOf(registeredFrom), Long.valueOf(channelId), phoneNo, name, idNo, provinceCode, province, cityCode, city, districtCode, district, address, contacts);
+    user = userService.registerAndReturn(Long.valueOf(registeredFrom), Long.valueOf(channelId), phoneNo, name, idNo, provinceCode, province, cityCode, city, districtCode, district, address, contacts);
+//    user = userRegisterService.register(Long.valueOf(registeredFrom), Long.valueOf(channelId), phoneNo, name, idNo, provinceCode, province, cityCode, city, districtCode, district, address, contacts); TODO
 
     UserRet userRet = new UserRet(user);
     return JsonResult.buildSuccessResult(null, userRet);
@@ -934,8 +934,8 @@ public class InnerController implements IBaseController {
     LOGGER.info("[/innerapi/user/register]channelId={},ip={}", channelId, getIp());
     User user = userService.findByPhoneInDb(phoneNo);
     if (user == null) {
-//      user = userService.registerAndReturn(phoneNo, StringUtils.defaultString(password, ""), channelId); TODO
-      user = userRegisterService.register(phoneNo, StringUtils.defaultString(password, ""), channelId);
+      user = userService.registerAndReturn(phoneNo, StringUtils.defaultString(password, ""), channelId);
+//      user = userRegisterService.register(phoneNo, StringUtils.defaultString(password, ""), channelId); TODO
     }
     if (user == null) {
       return JsonResult.buildErrorStateResult("注册失败", null);

src/main/java/cn/quantgroup/xyqb/controller/internal/user/UserController.java

@@ -194,8 +194,8 @@ public class UserController implements IBaseController {
       return JsonResult.buildErrorStateResult("登录失败", null);
     }
     if (user == null) {
-//      user = registerFastWhenLogin(phoneNo, channelId, createdFrom, appChannel,btRegisterChannelId,dimension); TODO
-      user = userRegisterService.register(phoneNo, channelId, createdFrom, appChannel,btRegisterChannelId,dimension);
+      user = registerFastWhenLogin(phoneNo, channelId, createdFrom, appChannel,btRegisterChannelId,dimension);
+//      user = userRegisterService.register(phoneNo, channelId, createdFrom, appChannel,btRegisterChannelId,dimension); TODO
       if (user == null) {
         throw new UserNotExistException("用户未找到");
       }
@@ -298,8 +298,8 @@ public class UserController implements IBaseController {
       LOGGER.info("用户注册失败，该手机号已经被注册：register -> registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
       return JsonResult.buildErrorStateResult("该手机号已经被注册", null);
     }
-//    if (!userService.register(phoneNo, password, registerFrom, getIp(), channelId,btRegisterChannelId,dimension)) { TODO
-    if (!userRegisterService.register(phoneNo, password, registerFrom, getIp(), channelId,btRegisterChannelId,dimension)) {
+    if (!userService.register(phoneNo, password, registerFrom, getIp(), channelId,btRegisterChannelId,dimension)) {
+//    if (!userRegisterService.register(phoneNo, password, registerFrom, getIp(), channelId,btRegisterChannelId,dimension)) { TODO
       LOGGER.info("用户快速注册失败，请稍后重试, registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
       return JsonResult.buildErrorStateResult("注册失败，请稍后重试", null);
     }