Merge branch 'cygx/cygx_need_910' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/company_user.go

@@ -1263,11 +1263,21 @@ func (this *CompanyUserController) List() {
 			userInteractionNumMap := cygxService.GetUserInteractionNumMap(userIds)               // 如果是权益部门下的人，展示互动量相关的信息
 
 			mfyxuserRecordRegisterMap := make(map[int]string)
+			mfyxuserRecordRegisterTimeMap := make(map[int]time.Time)
 			if len(userIdSlice) > 0 {
 				//用户绑定注册数据
+				clptuserRecordRegisterList, _ := cygx.GetCygxClptSessionrByUserIdsMyfx(userIdStr)
+				for _, userRecordRegister := range clptuserRecordRegisterList {
+					mfyxuserRecordRegisterTimeMap[userRecordRegister.UserId] = userRecordRegister.CreatedTime
+					mfyxuserRecordRegisterMap[userRecordRegister.UserId] = userRecordRegister.CreatedTime.Format(utils.FormatDateTime)
+				}
+
 				mfyxuserRecordRegisterList, _ := models.GetUserRecordRegisterByUserIdsMyfx(userIdStr)
 				for _, userRecordRegister := range mfyxuserRecordRegisterList {
-					mfyxuserRecordRegisterMap[userRecordRegister.UserId] = userRecordRegister.CreateTime.Format(utils.FormatDateTime)
+					//如果注册时间早于网页版的，或者网页版没有注册，就用这里的时间替换
+					if userRecordRegister.CreateTime.Before(mfyxuserRecordRegisterTimeMap[userRecordRegister.UserId]) || mfyxuserRecordRegisterMap[userRecordRegister.UserId] == "" {
+						mfyxuserRecordRegisterMap[userRecordRegister.UserId] = userRecordRegister.CreateTime.Format(utils.FormatDateTime)
+					}
 				}
 			}
 			for i := 0; i < lenList; i++ {

models/cygx/clpt_session.go

@@ -0,0 +1,26 @@
+package cygx
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"time"
+)
+
+type CygxClptSession struct {
+	SessionId       int `orm:"column(session_id);pk"`
+	Mobile          string
+	UserId          int
+	AccessToken     string
+	ExpireTime      time.Time
+	CreatedTime     time.Time
+	LastUpdatedTime time.Time
+	OpenId          string `description:"用户openid，最大长度：32"`
+	UnionId         string `description:"用户unionid，最大长度：64"`
+}
+
+// 根据用户id字符串获取用户绑定时间 (查研观向与买方研选小程序)
+func GetCygxClptSessionrByUserIdsMyfx(userIds string) (items []*CygxClptSession, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT user_id,min(created_time) as create_time FROM cygx_clpt_session WHERE user_id in (` + userIds + `) group by user_id`
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
+}