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

controllers/company_user.go

@@ -1267,7 +1267,7 @@ func (this *CompanyUserController) List() {
 		isUserYanXuanButtonShow, err := services.CheckCompanyUserYanXuanButton(sysUser.RoleTypeCode, sysUser.Mobile)
 		if err != nil {
 			br.Msg = "获取失败"
-			br.ErrMsg = "获取专项调研信息失败，Err:" + err.Error()
+			br.ErrMsg = "获取失败 CheckCompanyUserYanXuanButton ，Err:" + err.Error()
 			return
 		}
 
@@ -1278,14 +1278,39 @@ func (this *CompanyUserController) List() {
 			mfyxuserRecordRegisterMap := make(map[int]string)
 			mfyxuserRecordRegisterTimeMap := make(map[int]time.Time)
 			if len(userIdSlice) > 0 {
-				//用户绑定注册数据
-				clptuserRecordRegisterList, _ := cygx.GetCygxClptSessionrByUserIdsMyfx(userIdStr)
+				//用户查研观向网页版注册时间
+				clptuserRecordRegisterList, err := cygx.GetCygxClptSessionrByUserIdsMyfx(userIdStr)
+				if err != nil {
+					br.Msg = "获取失败"
+					br.ErrMsg = "获取失败，GetCygxClptSessionrByUserIdsMyfx Err:" + err.Error()
+					return
+				}
 				for _, userRecordRegister := range clptuserRecordRegisterList {
 					mfyxuserRecordRegisterTimeMap[userRecordRegister.UserId] = userRecordRegister.CreateTime
 					mfyxuserRecordRegisterMap[userRecordRegister.UserId] = userRecordRegister.CreateTime.Format(utils.FormatDateTime)
 				}
 
-				mfyxuserRecordRegisterList, _ := models.GetUserRecordRegisterByUserIdsMyfx(userIdStr)
+				//买方研选网页版注册时间
+				mfyxwebRecordRegisterList, err := cygx.GetCygxMfyxWebSessionByUserIdsMyfx(userIdStr)
+				if err != nil {
+					br.Msg = "获取失败"
+					br.ErrMsg = "获取失败，GetCygxMfyxWebSessionByUserIdsMyfx Err:" + err.Error()
+					return
+				}
+				for _, userRecordRegister := range mfyxwebRecordRegisterList {
+					//如果注册时间早于查研观向网页版的，或者没有注册，就用这里的时间替换
+					if userRecordRegister.CreatedTime.Before(mfyxuserRecordRegisterTimeMap[userRecordRegister.UserId]) || mfyxuserRecordRegisterMap[userRecordRegister.UserId] == "" {
+						mfyxuserRecordRegisterTimeMap[userRecordRegister.UserId] = userRecordRegister.CreatedTime
+						mfyxuserRecordRegisterMap[userRecordRegister.UserId] = userRecordRegister.CreatedTime.Format(utils.FormatDateTime)
+					}
+				}
+
+				mfyxuserRecordRegisterList, err := models.GetUserRecordRegisterByUserIdsMyfx(userIdStr)
+				if err != nil {
+					br.Msg = "获取失败"
+					br.ErrMsg = "获取失败 GetUserRecordRegisterByUserIdsMyfx ，Err:" + err.Error()
+					return
+				}
 				for _, userRecordRegister := range mfyxuserRecordRegisterList {
 					//如果注册时间早于网页版的，或者网页版没有注册，就用这里的时间替换
 					if userRecordRegister.CreateTime.Before(mfyxuserRecordRegisterTimeMap[userRecordRegister.UserId]) || mfyxuserRecordRegisterMap[userRecordRegister.UserId] == "" {

models/cygx/clpt_session.go

@@ -24,3 +24,24 @@ func GetCygxClptSessionrByUserIdsMyfx(userIds string) (items []*CygxClptSession,
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
+
+type CygxMfyxWebSession 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"`
+	SessionStatus   int    `description:"token状态，0正常，1被顶号"`
+}
+
+// 根据用户id字符串获取用户绑定时间 (买方研选网页版)
+func GetCygxMfyxWebSessionByUserIdsMyfx(userIds string) (items []*CygxMfyxWebSession, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT user_id,min(created_time) as create_time FROM cygx_mfyx_web_session WHERE user_id in (` + userIds + `) group by user_id`
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
+}