From f2f7928068892048a39a6f325e360ae184cd8769 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Thu, 24 Jun 2021 16:26:30 +0800
Subject: [PATCH] =?UTF-8?q?user=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/app.go      |  1 +
 business/model/user.go     | 29 ++++++++++++-----------------
 globals/beegodb/beegodb.go |  2 ++
 3 files changed, 15 insertions(+), 17 deletions(-)
 create mode 100644 business/model/app.go

diff --git a/business/model/app.go b/business/model/app.go
new file mode 100644
index 000000000..8b5379070
--- /dev/null
+++ b/business/model/app.go
@@ -0,0 +1 @@
+package model
diff --git a/business/model/user.go b/business/model/user.go
index 0e12ab4ba..fd09ee368 100644
--- a/business/model/user.go
+++ b/business/model/user.go
@@ -38,18 +38,18 @@ type MemberCard struct {
 
 type User struct {
 	ModelIDCULD
-	UserID  string  `orm:"size(48);column(user_id)" json:"userID" compact:"userID"`    // 内部唯一标识
-	UserID2 string  `orm:"size(48);column(user_id2)" json:"userID2" compact:"userID2"` // 外部唯一标识（一般用于登录）
-	Name    string  `orm:"size(48);index" json:"name" compact:"name"`                  // 外部显示标识（当前可以重复）
-	Mobile  *string `orm:"size(32);null" json:"mobile" compact:"mobile"`
-	Email   *string `orm:"size(32);null" json:"email" compact:"email"`
-	Avatar  string  `orm:"size(255)" json:"avatar" compact:"avatar"` // 头像
-	Status  int8    `json:"status" compact:"status"`
-	Type    int8    `json:"type" compact:"type"` // 用户类型
-
-	CityCode     int    `orm:"default(0)" json:"cityCode"`
-	DistrictCode int    `orm:"default(0);index" json:"districtCode"`
-	Address      string `orm:"size(255)" json:"address"`
+	UserID       string  `orm:"size(48);column(user_id)" json:"userID" compact:"userID"`    // 内部唯一标识
+	UserID2      string  `orm:"size(48);column(user_id2)" json:"userID2" compact:"userID2"` // 外部唯一标识（一般用于登录）
+	Name         string  `orm:"size(48);index" json:"name" compact:"name"`                  // 外部显示标识（当前可以重复）
+	Mobile       *string `orm:"size(32);null" json:"mobile" compact:"mobile"`
+	Email        *string `orm:"size(32);null" json:"email" compact:"email"`
+	Avatar       string  `orm:"size(255)" json:"avatar" compact:"avatar"` // 头像
+	Status       int8    `json:"status" compact:"status"`
+	Type         int8    `json:"type" compact:"type"` // 用户类型
+	Company      string  `json:"company"`             //公司名称
+	CityCode     int     `orm:"default(0)" json:"cityCode"`
+	DistrictCode int     `orm:"default(0);index" json:"districtCode"`
+	Address      string  `orm:"size(255)" json:"address"`
 
 	IDCardNo string `orm:"size(18);column(id_card_no)" json:"idCardNo" compact:"idCardNo"` // 身份证号
 	Remark   string `orm:"size(255)" json:"remark"`
@@ -57,11 +57,6 @@ type User struct {
 	LastLoginAt   *time.Time `orm:"null" json:"lastLoginAt"`
 	LastLoginIP   string     `orm:"size(64);column(last_login_ip)" json:"lastLoginIP"`
 	LastLoginType string     `orm:"size(16)" json:"lastLoginType"`
-	PopCode       string     `json:"popCode"`   //推广码
-	PopUser       string     `json:"popUser"`   //推广人
-	PopCount      int        `json:"popCount"`  //推荐人数
-	PopFlag       int        `json:"popFlag"`   //是否已通过推荐获得免费会员
-	PopedFlag     int        `json:"popedFlag"` //被邀请标志（弹框）
 }
 
 func (*User) TableUnique() [][]string {
diff --git a/globals/beegodb/beegodb.go b/globals/beegodb/beegodb.go
index 2b64585ea..c1abd9072 100644
--- a/globals/beegodb/beegodb.go
+++ b/globals/beegodb/beegodb.go
@@ -12,6 +12,8 @@ func Init() {
 	// orm.RegisterDataBase("c4", "mysql", "root:WebServer@1@tcp(gold1.jxc4.com:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true", 30)
 
 	orm.RegisterModel(&model.NewConfig{})
+	orm.RegisterModel(&model.User{})
+	orm.RegisterModel(&model.Place{})
 	// create table
 	orm.RunSyncdb("default", false, true)
 }