fix user relation

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

@@ -24,13 +24,8 @@ func insertThreeWxusers() {
 //三位会员内部关系
 func threebUserRelation() {
 	beego.BeeLogger.Warn("----------------begin copy wx users ")
-
 	//初始化会员信息
-	/*err := user_model.CopyWxUsers()
-	if err != nil {
-		beego.BeeLogger.Error("UpdateClassThreeInner CopyWxUsers err=[%s]", err)
-		return
-	}*/
+	user_model.CopyWxUsers()
 
 	beego.BeeLogger.Warn("----------------begin handle relation ")
 	wxUserId := int64(1)
@@ -42,11 +37,7 @@ func threebUserRelation() {
 	beego.BeeLogger.Warn("----------------begin callback wx_users ")
 
 	//回调更新wx_users
-	err := user_model.CallBackWxUsers()
-	if err != nil {
-		beego.BeeLogger.Error("UpdateClassThreeInner CallBackWxUsers err=[%s]", err)
-		return
-	}
+	user_model.CallBackWxUsers()
 
 	beego.BeeLogger.Warn("----------------end handle relation ")
 
@@ -86,35 +77,25 @@ func UpdateClassThreeInner(list []*user_model.ThreeWxUser, innerNo string, invit
 	inviteRank := int64(0)
 	//更新每个会员的 invite_rank
 	for _, item := range list {
-		threeWxUser := user_model.GetThreeWxUserById(item.Id, true)
-		if threeWxUser != nil {
-			threeWxUser.InviteRank = inviteRank
-			err := threeWxUser.UpdateField("InviteRank")
-			if err != nil {
-				beego.BeeLogger.Error("UpdateClassThreeInner rank err=[%s]", err)
-				return
-			}
-			inviteRank++
-		}
+		user_model.UpdateInviteRank(item.Id, inviteRank)
+		newArea := user_model.NewAvailableIntroArea(inviteRank)
+		introInnerNo := innerNo + newArea
+		user_model.UpdateIntroInfo(item.Id, newArea, introInnerNo)
+		inviteRank++
 	}
 
 	//更新会员内部编号
-	inviteList := user_model.GetInviteAllWxUsers(inviteId, true)
+	/*inviteList := user_model.GetInviteAllWxUsers(inviteId, false)
 	for _, item := range inviteList {
 		if item != nil {
 			newArea := user_model.NewAvailableIntroArea(item.InviteRank)
 			introInnerNo := innerNo + newArea
-			item.IntroArea = newArea
-			item.IntroInnerNo = introInnerNo
-			err := item.Save()
-			if err != nil {
-				beego.BeeLogger.Error("UpdateClassThreeInner introInnerNo err=[%s]", err)
-				return
-			}
+			user_model.UpdateIntroInfo(item.Id,newArea,introInnerNo)
 		}
-	}
+	}*/
 
 	//递归更新
+	inviteList := user_model.GetInviteAllWxUsers(inviteId, false)
 	for _, item := range inviteList {
 		if item != nil {
 			secondList := user_model.GetInviteAllWxUsers(item.Id, true)

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

@@ -181,74 +181,70 @@ func (self *ThreeWxUser) Save() error {
 }
 
 //迁移微信老会员
-func CopyWxUsers() error {
+func CopyWxUsers() {
 	o := orm.NewOrm()
 
 	//迁移当前记录
 	sql := `
-		delete from three_wx_users 
+		truncate table three_wx_users 
 	`
-	_, err := o.Raw(sql).Exec()
-	if err != nil {
-		beego.BeeLogger.Warn("ThreeWxUser.CopyWxUsers() err[%s]", err)
-		return err
-	}
+	o.Raw(sql).Exec()
 
 	//更新invite_id丢失会员
 	sql = `
 		update wx_users set invite_id=1 where invite_id=0 
 	`
-	_, err = o.Raw(sql).Exec()
-	if err != nil {
-		beego.BeeLogger.Warn("ThreeWxUser.CopyWxUsers() update wx_users err[%s]", err)
-		return err
-	}
+	o.Raw(sql).Exec()
 
 	//更新会员depart
 	sql = `
 		update wx_users set depart=1 where id=53
 	`
-	_, err = o.Raw(sql).Exec()
-	if err != nil {
-		beego.BeeLogger.Warn("ThreeWxUser.CopyWxUsers() update wx_users err[%s]", err)
-		return err
-	}
+	o.Raw(sql).Exec()
 
 	sql = `
 		update wx_users set depart=2 where id=13066
 	`
-	_, err = o.Raw(sql).Exec()
-	if err != nil {
-		beego.BeeLogger.Warn("ThreeWxUser.CopyWxUsers() update wx_users err[%s]", err)
-		return err
-	}
+	o.Raw(sql).Exec()
 
 	//迁移当前记录
 	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).Exec()
-	if err != nil {
-		beego.BeeLogger.Warn("ThreeWxUser.CopyWxUsers() err[%s]", err)
-		return err
-	}
-	return nil
+	o.Raw(sql).Exec()
+
+	return
 }
 
 //回写wx_users
-func CallBackWxUsers() error {
+func UpdateInviteRank(id, inviteRank int64) {
 	o := orm.NewOrm()
 	//更新wx_users会员关系
 	sql := `
+		update three_wx_users set invite_rank=? where id=?
+	`
+	o.Raw(sql, inviteRank, id).Exec()
+
+}
+
+func UpdateIntroInfo(id int64, intreArea, innerNo string) {
+	o := orm.NewOrm()
+	//更新wx_users会员关系
+	sql := `
+		update three_wx_users set intro_area=?,intre_inner_no =? where id=?
+	`
+	o.Raw(sql, intreArea, innerNo, id).Exec()
+
+}
+
+//回写wx_users
+func CallBackWxUsers() {
+	o := orm.NewOrm()
+	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 
 	`
-	_, err := o.Raw(sql).Exec()
-	if err != nil {
-		beego.BeeLogger.Warn("ThreeWxUser.CallWxUsers() update wx_users err[%s]", err)
-		return err
-	}
+	o.Raw(sql).Exec()
 
-	return nil
 }
 
 //更新关联表depart