xingzai il y a 1 an
Parent
commit
1555fdfa13
3 fichiers modifiés avec 33 ajouts et 9 suppressions
  1. 14 0
      controllers/company_user.go
  2. 2 0
      models/company/company_user.go
  3. 17 9
      models/user_record.go

+ 14 - 0
controllers/company_user.go

@@ -1241,6 +1241,15 @@ func (this *CompanyUserController) List() {
 		if sysUser.DepartmentId == utils.RAI_DEPARTMENT_ID {
 			userYanxuanPermissionMap := cygxService.GetCygxUserYanxuanPermissionMapItem(userIds) // 如果是权益部门下的人,则展示研选相关的信息
 			userInteractionNumMap := cygxService.GetUserInteractionNumMap(userIds)               // 如果是权益部门下的人,展示互动量相关的信息
+
+			mfyxuserRecordRegisterMap := make(map[int]string)
+			if len(userIdSlice) > 0 {
+				//用户绑定注册数据
+				mfyxuserRecordRegisterList, _ := models.GetUserRecordRegisterByUserIdsMyfx(userIdStr)
+				for _, userRecordRegister := range mfyxuserRecordRegisterList {
+					mfyxuserRecordRegisterMap[userRecordRegister.UserId] = userRecordRegister.CreateTime.Format(utils.FormatDateTime)
+				}
+			}
 			for i := 0; i < lenList; i++ {
 				item := list[i]
 				// 分产品阅读统计
@@ -1255,6 +1264,11 @@ func (this *CompanyUserController) List() {
 				} else {
 					list[i].MfyxStatus = "未开通"
 				}
+				if mfyxuserRecordRegisterMap[int(item.UserId)] != "" {
+					list[i].MfyxIsBinding = true
+					list[i].MfyxBindingTime = mfyxuserRecordRegisterMap[int(item.UserId)]
+				}
+				list[i].LastViewTimeStr = list[i].RaiLastViewTime.Format(utils.FormatDateTime)
 			}
 		}
 	}

+ 2 - 0
models/company/company_user.go

@@ -73,6 +73,8 @@ type CompanyUser struct {
 	MfyxEndDate              string    `description:"买方研选权限结束日期"`
 	MfyxStatus               string    `description:"买方研选状态'试用','未开通'"`
 	MfyxInteractionNum       int       `description:"互动量"`
+	MfyxIsBinding            bool      `description:"买方研选是否绑定"`
+	MfyxBindingTime          string    `description:"买方研选绑定时间"`
 }
 
 type CompanyUserListResp struct {

+ 17 - 9
models/user_record.go

@@ -24,28 +24,28 @@ type UserRecord struct {
 	UserId         int       `description:"用户id"`
 }
 
-//根据openid获取用户关系
+// 根据openid获取用户关系
 func GetUserRecordByOpenId(openId string) (item *UserRecord, err error) {
 	sql := `SELECT * FROM user_record WHERE open_id=? `
 	err = orm.NewOrm().Raw(sql, openId).QueryRow(&item)
 	return
 }
 
-//根据用户id和平台id获取用户关系
+// 根据用户id和平台id获取用户关系
 func GetUserRecordByUserId(userId, platform int) (item *UserRecord, err error) {
 	sql := `SELECT * FROM user_record WHERE user_id=? AND create_platform = ?`
 	err = orm.NewOrm().Raw(sql, userId, platform).QueryRow(&item)
 	return
 }
 
-//添加用户关系
+// 添加用户关系
 func AddUserRecord(record *UserRecord) (recordId int64, err error) {
 	o := orm.NewOrm()
 	recordId, err = o.Insert(record)
 	return
 }
 
-//根据openid绑定用户关系
+// 根据openid绑定用户关系
 func BindUserRecordByOpenid(userId int, openId, bindAccount string) (err error) {
 	o := orm.NewOrm()
 	msql := " UPDATE user_record SET user_id = ?,bind_account=? WHERE open_id = ? "
@@ -53,7 +53,7 @@ func BindUserRecordByOpenid(userId int, openId, bindAccount string) (err error)
 	return
 }
 
-//修改用户微信信息
+// 修改用户微信信息
 func ModifyUserRecordInfo(openId, nickName, headimgUrl, city, province, country string, sex, userId int) (err error) {
 	o := orm.NewOrm()
 	sql := `UPDATE user_record SET nick_name=?,headimgurl=?,sex=?,city=?,province=?,country=? WHERE user_id=? and openid=? `
@@ -61,7 +61,7 @@ func ModifyUserRecordInfo(openId, nickName, headimgUrl, city, province, country
 	return
 }
 
-//根据用户id删除该用户的所有关联关系
+// 根据用户id删除该用户的所有关联关系
 func DelUserRecordByUserId(userId int) (err error) {
 	o := orm.NewOrm()
 	sql := ` DELETE FROM user_record WHERE user_id=? `
@@ -77,7 +77,7 @@ func GetUserRecordListByUserIds(userIds string) (items []*UserRecord, err error)
 	return
 }
 
-//根据用户id字符串批量删除该用户的所有关联关系
+// 根据用户id字符串批量删除该用户的所有关联关系
 func DelUserRecordByUserIds(userIds string) (err error) {
 	o := orm.NewOrm()
 	sql := ` DELETE FROM user_record WHERE user_id in (` + userIds + `) `
@@ -85,16 +85,24 @@ func DelUserRecordByUserIds(userIds string) (err error) {
 	return
 }
 
-//根据用户id字符串获取用户绑定时间结构体
+// 根据用户id字符串获取用户绑定时间结构体
 type UserRecordRegisterSlice struct {
 	UserId     int       `description:"用户id"`
 	CreateTime time.Time `description:"用户第三方信息绑定注册时间"`
 }
 
-//根据用户id字符串获取用户绑定时间
+// 根据用户id字符串获取用户绑定时间
 func GetUserRecordRegisterByUserIds(userIds string) (items []*UserRecordRegisterSlice, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT user_id,min(create_time) as create_time FROM user_record WHERE user_id in (` + userIds + `) group by user_id`
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
+
+// 根据用户id字符串获取用户绑定时间 (查研观向与买方研选小程序)
+func GetUserRecordRegisterByUserIdsMyfx(userIds string) (items []*UserRecordRegisterSlice, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT user_id,min(create_time) as create_time FROM user_record WHERE user_id in (` + userIds + `) AND  create_platform IN  (4,10)  group by user_id`
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
+}