用户区分注册来源

platform-admin/src/main/java/com/platform/entity/TbCfUserInfoEntity.java

 package com.platform.entity;
 
+import sun.rmi.server.InactiveGroupException;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -37,6 +39,7 @@ public class TbCfUserInfoEntity implements Serializable {
      * 用户名
      */
     private String nick;
+    private Integer source;
     /**
      * 电话号码
      */
@@ -98,6 +101,14 @@ public class TbCfUserInfoEntity implements Serializable {
      */
     private Integer emailFlag;
 
+    public Integer getSource() {
+        return source;
+    }
+
+    public void setSource(Integer source) {
+        this.source = source;
+    }
+
     /**
      * 设置：用户id
      */
@@ -111,6 +122,7 @@ public class TbCfUserInfoEntity implements Serializable {
     public String getUserId() {
         return userId;
     }
+
     /**
      * 设置：用户编号
      */
@@ -124,6 +136,7 @@ public class TbCfUserInfoEntity implements Serializable {
     public String getUserNo() {
         return userNo;
     }
+
     /**
      * 设置：用户类型（1邮箱、2facebook、3twitter）
      */
@@ -137,6 +150,7 @@ public class TbCfUserInfoEntity implements Serializable {
     public Integer getUserType() {
         return userType;
     }
+
     /**
      * 设置：账号
      */
@@ -150,6 +164,7 @@ public class TbCfUserInfoEntity implements Serializable {
     public String getAccount() {
         return account;
     }
+
     /**
      * 设置：用户头像地址
      */
@@ -163,6 +178,7 @@ public class TbCfUserInfoEntity implements Serializable {
     public String getAvatar() {
         return avatar;
     }
+
     /**
      * 设置：用户名
      */
@@ -176,6 +192,7 @@ public class TbCfUserInfoEntity implements Serializable {
     public String getNick() {
         return nick;
     }
+
     /**
      * 设置：电话号码
      */
@@ -189,6 +206,7 @@ public class TbCfUserInfoEntity implements Serializable {
     public String getPhone() {
         return phone;
     }
+
     /**
      * 设置：是否绑定手机
      */
@@ -202,6 +220,7 @@ public class TbCfUserInfoEntity implements Serializable {
     public Integer getPhoneFlag() {
         return phoneFlag;
     }
+
     /**
      * 设置：密码
      */
@@ -215,6 +234,7 @@ public class TbCfUserInfoEntity implements Serializable {
     public String getPassword() {
         return password;
     }
+
     /**
      * 设置：上一次登录时间
      */
@@ -228,6 +248,7 @@ public class TbCfUserInfoEntity implements Serializable {
     public Date getLastLoginTime() {
         return lastLoginTime;
     }
+
     /**
      * 设置：上一次登录IP
      */
@@ -241,6 +262,7 @@ public class TbCfUserInfoEntity implements Serializable {
     public String getLastLoginIp() {
         return lastLoginIp;
     }
+
     /**
      * 设置：登录次数
      */
@@ -254,6 +276,7 @@ public class TbCfUserInfoEntity implements Serializable {
     public Integer getLoginCount() {
         return loginCount;
     }
+
     /**
      * 设置：邮箱
      */
@@ -267,6 +290,7 @@ public class TbCfUserInfoEntity implements Serializable {
     public String getEmail() {
         return email;
     }
+
     /**
      * 设置：facebook账号
      */
@@ -280,6 +304,7 @@ public class TbCfUserInfoEntity implements Serializable {
     public String getFacebook() {
         return facebook;
     }
+
     /**
      * 设置：创建时间
      */
@@ -293,6 +318,7 @@ public class TbCfUserInfoEntity implements Serializable {
     public Date getCreateTime() {
         return createTime;
     }
+
     /**
      * 设置：性别,0未知，1男性，2女性
      */
@@ -306,6 +332,7 @@ public class TbCfUserInfoEntity implements Serializable {
     public Integer getSex() {
         return sex;
     }
+
     /**
      * 设置：默认地址id
      */
@@ -319,6 +346,7 @@ public class TbCfUserInfoEntity implements Serializable {
     public String getDefaultAddressId() {
         return defaultAddressId;
     }
+
     /**
      * 设置：发出邀请的用户
      */
@@ -332,6 +360,7 @@ public class TbCfUserInfoEntity implements Serializable {
     public String getInvitedUserId() {
         return invitedUserId;
     }
+
     /**
      * 设置：总共邀请数量
      */
@@ -345,6 +374,7 @@ public class TbCfUserInfoEntity implements Serializable {
     public Integer getInvitedCount() {
         return invitedCount;
     }
+
     /**
      * 设置：是否有效
      */
@@ -358,6 +388,7 @@ public class TbCfUserInfoEntity implements Serializable {
     public Integer getEnableFlag() {
         return enableFlag;
     }
+
     /**
      * 设置：邮箱是否已经验证
      */

platform-admin/src/main/resources/com/platform/dao/TbCfUserInfoDao.xml

@@ -179,7 +179,7 @@
             </when>
             <otherwise>
                 ORDER BY
-                o.total DESC
+                u.createTime DESC
             </otherwise>
         </choose>
         <if test="offset != null and limit != null">

platform-admin/src/main/webapp/js/common.js

@@ -815,6 +815,23 @@ userTypeFormat = function (cellvalue) {
     return returnStr;
 };
 
+/**
+ * 注册来源
+ * @param cellvalue
+ * @returns {string}
+ */
+signTypeFormat = function (cellvalue) {
+    var returnStr = null;
+    if (cellvalue == '1') {
+        returnStr = "app";
+    } else if (cellvalue == '2') {
+        returnStr = "pc";
+    } else if (cellvalue == '3') {
+        returnStr = "mobile";
+    }
+
+    return returnStr;
+};
 /**
  * 是或者否翻译
  * @param cellvalue
@@ -866,9 +883,6 @@ activityStatusFormat = function (cellvalue) {
 }
 
 
-
-
-
 shows = function (cellvalue, options, rowObject) {
     let returnStr;
     returnStr = "<i-button class=\"ivu-btn ivu-btn-info\"  onclick=showWord('" + rowObject.id + "') type=\"info\">查看</i-button>";

platform-admin/src/main/webapp/js/sys/tbcfuserinfo.js

@@ -4,15 +4,16 @@ $(function () {
         colModel: [
             {label: 'userId', name: 'userId', index: 'user_id', key: true, hidden: true},
             {label: '用户编号', name: 'userNo', index: 'user_no', width: 160},
-			{label: '用户类型', name: 'userType', index: 'user_type', width: 80,formatter:userTypeFormat},
+            {label: '用户类型', name: 'userType', index: 'user_type', width: 80, formatter: userTypeFormat},
             {label: '账号', name: 'account', index: 'account', width: 120},
-			{label: '用户头像地址', name: 'avatar', index: 'avatar', width: 100,formatter:imageFormat},
+            {label: '注册来源', name: 'source', index: 'source', width: 60, formatter: signTypeFormat},
+            {label: '用户头像地址', name: 'avatar', index: 'avatar', width: 100, formatter: imageFormat},
             {label: '用户名', name: 'nick', index: 'nick', width: 80},
             {label: '下单次数', name: 'count', index: 'count', width: 80},
-			{label: '总金额', name: 'total', index: 'total', width: 80,formatter:moneyFormat},
+            {label: '总金额', name: 'total', index: 'total', width: 80, formatter: moneyFormat},
             {label: '使用优惠券次数', name: 'num', index: 'num', width: 80},
             {label: '电话号码', name: 'phone', index: 'phone', width: 100},
-			{label: '是否绑定手机', name: 'phoneFlag', index: 'phone_flag', width: 80,formatter:yesOrNoFormat},
+            {label: '是否绑定手机', name: 'phoneFlag', index: 'phone_flag', width: 80, formatter: yesOrNoFormat},
             {label: '密码', name: 'password', index: 'password', width: 80, hidden: true},
             {label: '上一次登录时间', name: 'lastLoginTime', index: 'last_login_time', width: 120},
             {label: '上一次登录IP', name: 'lastLoginIp', index: 'last_login_ip', width: 80},
@@ -20,16 +21,16 @@ $(function () {
             {label: '邮箱', name: 'email', index: 'email', width: 120},
             {label: 'facebook账号', name: 'facebook', index: 'facebook', width: 120},
             {label: '创建时间', name: 'createTime', index: 'create_time', width: 120},
-			{label: '性别', name: 'sex', index: 'sex', width: 80,formatter:sexFormat},
+            {label: '性别', name: 'sex', index: 'sex', width: 80, formatter: sexFormat},
             {label: '默认地址id', name: 'defaultAddressId', index: 'default_address_id', width: 200},
             {label: '邀请用户', name: 'invitedUserId', index: 'invited_user_id', width: 120},
             {label: '邀请人数', name: 'invitedCount', index: 'invited_count', width: 80},
-			{label: '是否有效', name: 'enableFlag', index: 'enable_flag', width: 60,formatter:yesOrNoFormat},
-			{label: '邮箱是否已经验证', name: 'emailFlag', index: 'email_flag', width: 80,formatter:yesOrNoFormat}],
+            {label: '是否有效', name: 'enableFlag', index: 'enable_flag', width: 60, formatter: yesOrNoFormat},
+            {label: '邮箱是否已经验证', name: 'emailFlag', index: 'email_flag', width: 80, formatter: yesOrNoFormat}],
         shrinkToFit: true,
-		datatype : "json",
-		rowNum:15,
-		rowList:[15,30,45],
+        datatype: "json",
+        rowNum: 15,
+        rowList: [15, 30, 45],
         mtype: "POST",
         rownumbers: true,
         rownumWidth: 40,
@@ -91,7 +92,7 @@ let vm = new Vue({
         },
         del: function (event) {
             let userIds = getSelectedRows("#jqGrid");
-			if (userIds == null){
+            if (userIds == null) {
                 return;
             }
 
@@ -109,9 +110,9 @@ let vm = new Vue({
                 });
             });
         },
-		getInfo: function(userId){
+        getInfo: function (userId) {
             Ajax.request({
-                url: "../tbcfuserinfo/info/"+userId,
+                url: "../tbcfuserinfo/info/" + userId,
                 async: true,
                 successCallback: function (r) {
                     vm.tbCfUserInfo = r.tbCfUserInfo;
@@ -127,7 +128,7 @@ let vm = new Vue({
             }).trigger("reloadGrid");
             vm.handleReset('formValidate');
         },
-        reloadSearch: function() {
+        reloadSearch: function () {
             vm.q = {
                 name: ''
             };