fix

models/cygx_mfyx_gzh_user_record.go

@@ -10,6 +10,7 @@ type CygxMfyxGzhUserRecord struct {
 	OpenId          string    `description:"用户openid，最大长度：32"`
 	UnionId         string    `description:"用户unionid，最大长度：64"`
 	NickName        string    `descritpion:"用户昵称，最大长度：32"`
+	RealName        string    `descritpion:"用户真实姓名"`
 	Sex             int       `descritpion:"普通用户性别，1为男性，2为女性"`
 	Subscribe       int       `description:"是否关注"`
 	SubscribeTime   time.Time `description:"关注时间"`

models/user_record.go

@@ -69,15 +69,6 @@ func GetUserRecordList(condition string, pars []interface{}) (items []*UserRecor
 }
 
 
-
-// 根据openid获取用户关系
-func GetUserRecordByOpenId(openId string) (item *UserRecord, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM cygx_mfyx_gzh_user_record WHERE open_id=? `
-	err = o.Raw(sql, openId).QueryRow(&item)
-	return
-}
-
 // 根据openid解除绑定用户关系
 func UnBindUserRecordByOpenid(openId string) (err error) {
 	o := orm.NewOrmUsingDB("weekly_report")

services/user.go

@@ -11,14 +11,14 @@ var ERR_NO_USER_RECORD = errors.New("用户关系没有入库")
 var ERR_USER_NOT_BIND = errors.New("用户没有绑定")
 
 //通过用户 关系表记录  和  用户记录  格式化返回 用户数据
-func formatWxUserAndUserRecord(wxUser *models.WxUserItem, userRecord *models.UserRecord) {
+func formatWxUserAndUserRecord(wxUser *models.WxUserItem, userRecord *models.CygxMfyxGzhUserRecord) {
 	wxUser.OpenId = userRecord.OpenId
 	wxUser.UnionId = userRecord.UnionId
 	wxUser.NickName = userRecord.NickName
 	//wxUser.RealName = userRecord.RealName
 	//wxUser.BindAccount = userRecord.BindAccount
 	wxUser.Headimgurl = userRecord.Headimgurl
-	wxUser.SessionKey = userRecord.SessionKey
+	//wxUser.SessionKey = userRecord.SessionKey
 }
 
 func GetWxUserItemByOpenId(unionId string) (item *models.WxUserItem, err error) {
@@ -49,7 +49,7 @@ func GetWxUserItemByOpenId(unionId string) (item *models.WxUserItem, err error)
 // 通过openid获取用户信息
 func GetWxUserItemByOpenId2(openid string) (item *models.WxUserItem, err error) {
 	//通过openid获取用户关联信息
-	userRecord, userRecordErr := models.GetUserRecordByOpenId(openid)
+	userRecord, userRecordErr := models.GetCygxUserRecordByOpenid(openid)
 	fmt.Println(userRecordErr)
 	//fmt.Println("userRecordErr", userRecordErr)
 	if userRecordErr != nil {
@@ -68,17 +68,17 @@ func GetWxUserItemByOpenId2(openid string) (item *models.WxUserItem, err error)
 	}
 
 	//该openid没有绑定用户
-	if userRecord.UserId <= 0 {
+	if userRecord.CygxUserId <= 0 {
 		err = ERR_USER_NOT_BIND
 		item = new(models.WxUserItem)
 		//格式化返回用户数据
 		formatWxUserAndUserRecord(item, userRecord)
 		return
 	}
-	fmt.Println("userRecord.UserId ", userRecord.UserId)
+	fmt.Println("userRecord.UserId ", userRecord.CygxUserId)
 
 	//获取用户信息
-	item, wxUserErr := models.GetWxUserItemByUserId(userRecord.UserId)
+	item, wxUserErr := models.GetWxUserItemByUserId(userRecord.CygxUserId)
 	//fmt.Println("wxUserErr", wxUserErr)
 	if wxUserErr != nil {
 		err = wxUserErr