替换老注册接口

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

@@ -16,6 +16,7 @@ import cn.quantgroup.xyqb.service.api.IUserApiService;
 import cn.quantgroup.xyqb.service.auth.IIdCardService;
 import cn.quantgroup.xyqb.service.http.IHttpService;
 import cn.quantgroup.xyqb.service.merchant.IMerchantService;
+import cn.quantgroup.xyqb.service.register.IUserRegisterService;
 import cn.quantgroup.xyqb.service.session.ISessionService;
 import cn.quantgroup.xyqb.service.sms.ISmsService;
 import cn.quantgroup.xyqb.service.user.*;
@@ -99,6 +100,9 @@ public class MotanUserServiceImpl implements UserMotanService {
   @Autowired
   private IUserApiService userApiService;
 
+  @Autowired
+  private IUserRegisterService userRegisterService;
+
   @Override
   public UserSysResult<XUser> saveUserRelatedInfo(UserRelatedBean userRelatedBean) {
     return null;
@@ -294,7 +298,8 @@ 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 = 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) {
       return returnErrorValue("账户或者密码错误");
@@ -631,7 +636,8 @@ 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());
+//      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) {
       throw new RuntimeException(USER_ERROR_OR_PASSWORD_ERROR);

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

@@ -85,7 +85,7 @@ public class AppController implements IBaseController {
     LOGGER.info("app/login第三方用户登录, loginFrom:{},channelId：{},btRegisterChannelId:{} requestIp:{},idNo:{},name:{}", registerFrom,channelId,btRegisterChannelId, requestIp,idNo,name);
     User user = userService.findByPhoneInDb(phoneNo);
     if (user == null) {
-//      user = register(registerFrom, phoneNo, idNo, name, channelId,btRegisterChannelId);
+//      user = register(registerFrom, phoneNo, idNo, name, channelId,btRegisterChannelId); TODO
       user = userRegisterService.register(registerFrom, phoneNo, idNo, name, channelId,btRegisterChannelId);
     }
     if (user == null) {
@@ -170,7 +170,7 @@ public class AppController implements IBaseController {
     LOGGER.info("app/login_super第三方用户登录, loginFrom:{},channelId：{},btRegisterChannelId:{} requestIp:{},idNo:{},name:{}", registerFrom,channelId,btRegisterChannelId, requestIp,idNo,name);
     User user = userService.findByPhoneInDb(phoneNo);
     if (user == null) {
-//      user = register(registerFrom, phoneNo, idNo, name, channelId,btRegisterChannelId);
+//      user = register(registerFrom, phoneNo, idNo, name, channelId,btRegisterChannelId); TODO
       user = userRegisterService.register(registerFrom, phoneNo, idNo, name, channelId,btRegisterChannelId);
     }
     if (user == null) {

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

@@ -939,7 +939,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);
+//      user = userService.registerAndReturn(phoneNo, StringUtils.defaultString(password, ""), channelId); TODO
+      user = userRegisterService.register(phoneNo, StringUtils.defaultString(password, ""), channelId);
     }
     if (user == null) {
       return JsonResult.buildErrorStateResult("注册失败", null);

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

@@ -16,6 +16,7 @@ import cn.quantgroup.xyqb.model.JsonResult;
 import cn.quantgroup.xyqb.model.UserModel;
 import cn.quantgroup.xyqb.model.UserStatistics;
 import cn.quantgroup.xyqb.service.merchant.IMerchantService;
+import cn.quantgroup.xyqb.service.register.IUserRegisterService;
 import cn.quantgroup.xyqb.service.session.ISessionService;
 import cn.quantgroup.xyqb.service.sms.ISmsService;
 import cn.quantgroup.xyqb.service.user.IUserDetailService;
@@ -73,6 +74,8 @@ public class UserController implements IBaseController {
   private IMerchantService merchantService;
   @Autowired
   private IWechatService wechatService;
+  @Autowired
+  private IUserRegisterService userRegisterService;
 
   @RequestMapping("/test")
   public JsonResult test() {
@@ -236,7 +239,8 @@ public class UserController implements IBaseController {
       return JsonResult.buildErrorStateResult("登录失败", null);
     }
     if (user == null) {
-      user = registerFastWhenLogin(phoneNo, channelId, createdFrom, appChannel,btRegisterChannelId,dimension);
+//      user = registerFastWhenLogin(phoneNo, channelId, createdFrom, appChannel,btRegisterChannelId,dimension); TODO
+      user = userRegisterService.register(phoneNo, channelId, createdFrom, appChannel,btRegisterChannelId,dimension);
       if (user == null) {
         throw new UserNotExistException("用户未找到");
       }
@@ -335,7 +339,8 @@ public class UserController implements IBaseController {
       LOGGER.info("用户注册失败，该手机号已经被注册, registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
       return JsonResult.buildErrorStateResult("该手机号已经被注册", null);
     }
-    if (!userService.register(phoneNo, password, registerFrom, getIp(), channelId,btRegisterChannelId,dimension)) {
+//    if (!userService.register(phoneNo, password, registerFrom, getIp(), channelId,btRegisterChannelId,dimension)) { TODO
+    if (!userRegisterService.register(phoneNo, password, registerFrom, getIp(), channelId,btRegisterChannelId,dimension)) {
       LOGGER.info("用户快速注册失败，请稍后重试, registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
       return JsonResult.buildErrorStateResult("注册失败，请稍后重试", null);
     }

src/main/java/cn/quantgroup/xyqb/service/register/impl/UserRegisterServiceImpl.java

@@ -54,7 +54,7 @@ public class UserRegisterServiceImpl extends AbstractUserRegisterService {
         UserRegisterParam userRegisterParam = UserRegisterParam.builder()
                 .registerFrom(registerFrom).phoneNo(phoneNo).password(password)
                 .generateRandomPwd(false).sendSuccessSms(true).sendAppSms(true)
-                .sendSuccessMq(false)
+                .sendSuccessMq(true)
                 .build();
         return registerDefault(userRegisterParam);
     }