Browse Source

fix:多添加几个字段

Roc 1 year ago
parent
commit
e55c4f7a85
2 changed files with 29 additions and 19 deletions
  1. 21 14
      logic/report/research_report.go
  2. 8 5
      services/report/report_view_record.go

+ 21 - 14
logic/report/research_report.go

@@ -310,25 +310,32 @@ func GetResearchReportTypeContentInfo(researchReportTypeId, userId uint64) (resu
 
 // UserViewRedisData 阅读数据
 type UserViewRedisData struct {
-	Mobile      string `json:"mobile"`
-	Email       string `json:"email"`
-	RealName    string `json:"real_name"`
-	CompanyName string `json:"company_name"`
-	ViewTime    string `json:"view_time" description:"阅读时间,格式:2022-02-17 13:06:13"`
-	ProductId   int    `json:"product_id" description:"报告所属产品,ficc:1,权益:2"`
-	CompanyId   int    `json:"company_id" description:"客户id"`
+	Mobile          string `json:"mobile"`
+	Email           string `json:"email"`
+	RealName        string `json:"real_name"`
+	CompanyName     string `json:"company_name"`
+	ViewTime        string `json:"view_time" description:"阅读时间,格式:2022-02-17 13:06:13"`
+	ProductId       int    `json:"product_id" description:"报告所属产品,ficc:1,权益:2"`
+	CompanyId       int    `json:"company_id" description:"客户id"`
+	UserId          int    `json:"user_id" description:"用户id"`
+	ReportId        int    `json:"report_id" description:"报告ID"`
+	ReportChapterId int    `json:"report_chapter_id" description:"章节ID"`
+	StopTime        int    `json:"stop_time" description:"停留时间"`
 }
 
 // PushViewRecordNewRedisData 阅读数据加入到redis
 func PushViewRecordNewRedisData(userViewHistory *user_view_history.UserViewHistory, companyId int) bool {
 	data := &UserViewRedisData{
-		Mobile:      userViewHistory.Mobile,
-		Email:       userViewHistory.Email,
-		RealName:    userViewHistory.RealName,
-		CompanyName: userViewHistory.CompanyName,
-		ViewTime:    userViewHistory.CreatedTime.Format(utils.FormatDateTime),
-		ProductId:   1,
-		CompanyId:   companyId,
+		Mobile:          userViewHistory.Mobile,
+		Email:           userViewHistory.Email,
+		RealName:        userViewHistory.RealName,
+		CompanyName:     userViewHistory.CompanyName,
+		ViewTime:        userViewHistory.CreatedTime.Format(utils.FormatDateTime),
+		ProductId:       1,
+		CompanyId:       companyId,
+		UserId:          int(userViewHistory.UserID),
+		ReportId:        int(userViewHistory.ResearchReportID),
+		ReportChapterId: int(userViewHistory.ResearchReportTypeID),
 	}
 
 	if global.Redis != nil {

+ 8 - 5
services/report/report_view_record.go

@@ -43,11 +43,14 @@ func AddViewRecord(userInfo user.UserInfo, reportId int, classifyName string, re
 
 	//新增redis阅读记录
 	userViewHistory := &user_view_history.UserViewHistory{
-		Mobile:      userInfo.Mobile,
-		Email:       userInfo.Email,
-		RealName:    userInfo.RealName,
-		CompanyName: companyInfo.CompanyName,
-		CreatedTime: time.Now(),
+		Mobile:               userInfo.Mobile,
+		Email:                userInfo.Email,
+		RealName:             userInfo.RealName,
+		CompanyName:          companyInfo.CompanyName,
+		CreatedTime:          time.Now(),
+		UserID:               userInfo.UserID,
+		ResearchReportID:     uint64(record.ReportId),
+		ResearchReportTypeID: uint64(record.ReportChapterId),
 	}
 	ret := report.PushViewRecordNewRedisData(userViewHistory, int(userInfo.CompanyID))
 	if !ret {