|
@@ -1277,14 +1277,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] == "" {
|