Merge branch 'channel_user'

# Conflicts:
#	netflix-dao/src/main/java/com/cyksj/model/entity/User.java

netflix-dao/src/main/java/com/cyksj/model/entity/User.java

@@ -51,5 +51,10 @@ public class User extends BaseEntity implements Serializable{
     private BigDecimal points;
 
     private BigDecimal activePoints;
+
+    /**
+     * 推广id
+     */
+    private Long popularizeId;
 }
 

netflix-dao/src/main/java/com/cyksj/model/request/LoginPhoneReq.java

@@ -33,4 +33,9 @@ public class LoginPhoneReq {
 	 * 1短信登录、2邮箱登录
 	 */
 	private Integer type;
+
+	/**
+	 * 推广id
+	 */
+	private Long popularizeId;
 }

netflix-dao/src/main/java/com/cyksj/model/views/ChannelPopularizeView.java

@@ -69,6 +69,18 @@ public class ChannelPopularizeView {
     @DbField("select count(v.id) from channel_popularize_visit v where v.popularize_id = cp.id ")
     private Integer visit;
 
+    /**
+     * 邮箱注册人数
+     */
+    @DbField("select count(u.id) from user u where u.popularize_id = cp.id and u.email != ''")
+    private Integer emailCount;
+
+    /**
+     * 手机注册人数
+     */
+    @DbField("select count(u.id) from user u where u.popularize_id = cp.id and u.login_phone != ''")
+    private Integer phoneCount;
+
     /**
      * 订单数
      */

netflix-web/src/main/java/com/cyksj/web/controller/user/AuthorizationController.java

@@ -354,6 +354,9 @@ public class AuthorizationController {
         Long sharedId = loginPhoneReq.getSharedId();
         if (user == null) {
             user = new User();
+            if (loginPhoneReq.getPopularizeId() != null) {
+                user.setPopularizeId(loginPhoneReq.getPopularizeId());
+            }
             if (loginPhoneReq.getType() == 1) {
                 user.setLoginPhone(loginPhoneReq.getPhone());
             } else if (loginPhoneReq.getType() == 2) {