Merge branch 'feature/20171113-QGCPGL-467' of...

Merge branch 'feature/20171113-QGCPGL-467' of http://gitabc.xyqb.com/head_group/xyqb-user2 into feature/20171113-QGCPGL-467

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

@@ -282,12 +282,7 @@ public class AppController implements IBaseController {
         LOGGER.error("保存 UserDetail 出现异常", e);
       }
     }
-    //增加登陆统计发送
-    UserStatistics statistics=new UserStatistics(user,null,2,channelId);
-    MqUtils.sendLoanVest(statistics);
-    //增加用户注册广播
-    UserRegisterMqMessage registerMqMessage=new UserRegisterMqMessage(user);
-    MqUtils.sendRegisterMessage(registerMqMessage);
+    MqUtils.sendRegisterMessage(channelId,user);
     return user;
   }
 

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

@@ -228,16 +228,12 @@ public class InnerController implements IBaseController {
     user = userService.saveUser(user);
     UserRet userRet = null;
     if (user != null) {
-      UserStatistics statistics=new UserStatistics(user,null,2,registeredFrom);
-      MqUtils.sendLoanVest(statistics);
-      userRet = new UserRet(user);
-      //增加用户注册广播
-      UserRegisterMqMessage registerMqMessage=new UserRegisterMqMessage(user);
-      MqUtils.sendRegisterMessage(registerMqMessage);
+      userRet = MqUtils.sendRegisterMessage(registeredFrom, user);
     }
     return JsonResult.buildSuccessResult(null, userRet);
   }
 
+
   /**
    * 保存用户详细信息
    */

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

@@ -162,11 +162,7 @@ public class UserController implements IBaseController {
     }
     User user=userService.registerAndReturn(phoneNo, password, registerFrom,btRegisterChannelId);
     LOGGER.info("用户快速注册成功, registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
-    UserStatistics statistics=new UserStatistics(user,dimension,2,channelId);
-    MqUtils.sendLoanVest(statistics);
-    //增加用户注册广播
-    UserRegisterMqMessage registerMqMessage=new UserRegisterMqMessage(user);
-    MqUtils.sendRegisterMessage(registerMqMessage);
+     MqUtils.sendRegisterMessage(channelId, user);
     return user;
   }
 

src/main/java/cn/quantgroup/xyqb/service/user/impl/UserServiceImpl.java

@@ -192,12 +192,7 @@ public class UserServiceImpl implements IUserService {
       smsService.sendAfterRegister(phoneNo);
     }
     if(registerSuccess){
-      //增加登陆统计发送
-      UserStatistics statistics=new UserStatistics(user,dimension,2,channelId);
-      MqUtils.sendLoanVest(statistics);
-      //增加用户注册广播
-      UserRegisterMqMessage registerMqMessage=new UserRegisterMqMessage(user);
-      MqUtils.sendRegisterMessage(registerMqMessage);
+      MqUtils.sendRegisterMessage(channelId, user);
     }
     return user != null;
   }

src/main/java/cn/quantgroup/xyqb/util/MqUtils.java

 package cn.quantgroup.xyqb.util;
 
+import cn.quantgroup.xyqb.entity.User;
 import cn.quantgroup.xyqb.model.UserRegisterMqMessage;
+import cn.quantgroup.xyqb.model.UserRet;
 import cn.quantgroup.xyqb.model.UserStatistics;
 import cn.quantgroup.xyqb.service.mq.IRegisterMqService;
 import cn.quantgroup.xyqb.service.mq.IVestService;
@@ -37,4 +39,15 @@ public class MqUtils {
           message, e);
     }
   }
+
+  public static UserRet sendRegisterMessage(Long registeredFrom, User user) {
+    UserRet userRet;
+    UserStatistics statistics=new UserStatistics(user,null,2,registeredFrom);
+    MqUtils.sendLoanVest(statistics);
+    userRet = new UserRet(user);
+    //增加用户注册广播
+    UserRegisterMqMessage registerMqMessage=new UserRegisterMqMessage(user);
+    MqUtils.sendRegisterMessage(registerMqMessage);
+    return userRet;
+  }
 }