fix user relation

go/gopath/src/fohow.com/apps/controllers/cron_controller/three_user_relation.go

@@ -23,11 +23,22 @@ func insertThreeWxusers() {
 
 //三位会员内部关系
 func threebUserRelation() {
+	//初始化会员信息
+	err := user_model.CopyWxUsers()
+	if err != nil {
+		beego.BeeLogger.Error("UpdateClassThreeInner CopyWxUsers err=[%s]", err)
+		return
+	}
 	wxUserId := int64(1)
 	innerNo := "M"
 	//自公司账号自上而下递归更新
 	inviteList := user_model.GetInviteAllWxUsers(wxUserId, true)
 	UpdateClassThreeInner(inviteList, innerNo, wxUserId)
+	err = user_model.CallBackWxUsers()
+	if err != nil {
+		beego.BeeLogger.Error("UpdateClassThreeInner CallBackWxUsers err=[%s]", err)
+		return
+	}
 	//time.Sleep(time.Duration(300) * time.Second)
 }
 

go/gopath/src/fohow.com/apps/models/balance_model/balance.go

@@ -83,6 +83,7 @@ type BalanceOrder struct {
 	TotalPrice        int64     `orm:"column(total_price);null"     json:"total_price"`                  // int(11)
 	PaiedPrice        int64     `orm:"column(paied_price);null"     json:"paied_price"`                  // int(11)
 	State             int64     `orm:"column(state);null"                             json:"state"`      // tinyint(1)
+	Depart            int64     `orm:"column(depart)" json:"-"`                                          // datetime
 	Remark            string    `orm:"column(remark);null"                            json:"remark"`     // varchar(64)
 	CreatedAt         time.Time `orm:"column(created_at);auto_now_add;type(datetime)" json:"-"`          // datetime
 	UpdatedAt         time.Time `orm:"column(updated_at);auto_now;type(datetime)"     json:"-"`          // datetime

go/gopath/src/fohow.com/apps/models/order_model/order.go

@@ -103,6 +103,7 @@ type Order struct {
 	CTime          int64                    `orm:"-"                                 json:"ctime"`                              // int(11)
 	DTime          int64                    `orm:"-"                                 json:"dtime"`                              // int(11)
 	Freight        int64                    `orm:"column(freight);null"                            json:"freight"`              // int(11)
+	Depart         int64                    `orm:"column(depart)" json:"-"`                                                     // datetime
 	DispatchTime   time.Time                `orm:"column(dispatch_time);null;type(datetime)"           json:"dispatch_time"`
 	ReceiveTime    time.Time                `orm:"column(receive_time);null;type(datetime)"            json:"receive_time"`
 	PaiedTime      time.Time                `orm:"column(paied_time);null;type(datetime)"              json:"paied_time"` // int(11)

go/gopath/src/fohow.com/apps/models/user_model/shop_application.go

@@ -28,6 +28,7 @@ type ShopApplication struct {
 	Status    bool      `orm:"column(status)"                            json:"status"`
 	Remark    string    `orm:"column(remark);null"                                json:"remark"` // varchar(255)
 	Passtime  time.Time `orm:"column(pass_time);type(datetime)"                   json:"pass_time"`
+	Depart    int64     `orm:"column(depart)" json:"-"`                                      // datetime
 	CreatedAt time.Time `orm:"column(created_at);null;auto_now_add;type(datetime)" json:"-"` // datetime
 	UpdatedAt time.Time `orm:"column(updated_at);null;auto_now;type(datetime)"     json:"-"` // datetime
 }

go/gopath/src/fohow.com/apps/models/user_model/three_wx_user.go

@@ -181,7 +181,7 @@ func (self *ThreeWxUser) Save() error {
 }
 
 //迁移微信老会员
-func (self *ThreeWxUser) CopyWxUsers() error {
+func CopyWxUsers() error {
 	o := orm.NewOrm()
 
 	//迁移当前记录
@@ -208,7 +208,7 @@ func (self *ThreeWxUser) CopyWxUsers() error {
 	sql = `
 		insert into three_wx_users (id,invite_id,intro_inner_no,intro_area) select id,invite_id,intro_inner_no,intro_area from wx_users 
 	`
-	_, err = o.Raw(sql, self.Id).Exec()
+	_, err = o.Raw(sql).Exec()
 	if err != nil {
 		beego.BeeLogger.Warn("ThreeWxUser.CopyWxUsers() err[%s]", err)
 		return err
@@ -217,10 +217,9 @@ func (self *ThreeWxUser) CopyWxUsers() error {
 }
 
 //回写wx_users
-func (self *ThreeWxUser) CallBackWxUsers() error {
+func CallBackWxUsers() error {
 	o := orm.NewOrm()
-
-	//更新invite_id丢失会员
+	//更新wx_users会员关系
 	sql := `
 		update wx_users a , three_wx_users b set a.intro_inner_no=b.intro_inner_no,a.intro_area=b.intro_area where a.id=b.id 
 	`

go/gopath/src/fohow.com/apps/models/user_model/wx_user.go

@@ -58,6 +58,8 @@ type WxUser struct {
 	//团队业绩
 	SaleGroup    float64 `orm:"column(sale_group);null"              json:"sale_group"` // int(11)
 	SaleGroupSum float64 `orm:"column(sale_group_sum)" json:"sale_group_sum"`           // datetime
+	Depart       int64   `orm:"column(depart)" json:"-"`                                // datetime
+
 	//等级
 	Rank        int64     `orm:"column(rank);null"              json:"rank"`      // int(11)
 	PartnerTime int64     `orm:"column(partner_time);null"              json:"-"` // 群主时间