xingzai vor 3 Jahren
Ursprung
Commit
f9ba8747b3
3 geänderte Dateien mit 44 neuen und 37 gelöschten Zeilen
  1. 20 16
      controllers/article.go
  2. 20 17
      controllers/tactics.go
  3. 4 4
      models/article_history_record.go

+ 20 - 16
controllers/article.go

@@ -134,23 +134,27 @@ func (this *ArticleController) Detail() {
 
 			if strings.Contains(companyPermission, articlePermissionPermissionName) {
 				hasPermission = 1
-				detailNew, err := models.GetNewArticleHistoryRecord(uid, articleId)
-				if err != nil {
-					br.Msg = "获取信息失败"
-					br.ErrMsg = "获取信息失败,Err:" + err.Error()
-					return
-				}
-				recordCount, _ := models.GetNoAddStoptimeArticleCount(detailNew.Id)
-				if recordCount < 1 {
-					historyRecord := new(models.CygxArticleHistoryRecord)
-					historyRecord.UserId = uid
-					historyRecord.ArticleId = articleId
-					historyRecord.CreateTime = time.Now()
-					historyRecord.Mobile = user.Mobile
-					historyRecord.Email = user.Email
-					historyRecord.CompanyId = user.CompanyId
-					historyRecord.CompanyName = user.CompanyName
+				historyRecord := new(models.CygxArticleHistoryRecord)
+				historyRecord.UserId = uid
+				historyRecord.ArticleId = articleId
+				historyRecord.CreateTime = time.Now()
+				historyRecord.Mobile = user.Mobile
+				historyRecord.Email = user.Email
+				historyRecord.CompanyId = user.CompanyId
+				historyRecord.CompanyName = user.CompanyName
+				recordCount, _ := models.GetNoAddStoptimeArticleCount(uid, articleId)
+				if recordCount == 0 {
 					go models.AddCygxArticleHistoryRecord(historyRecord)
+				} else {
+					detailNew, err := models.GetNewArticleHistoryRecord(uid, articleId)
+					if err != nil {
+						br.Msg = "获取信息失败"
+						br.ErrMsg = "获取信息失败,Err:" + err.Error()
+						return
+					}
+					if detailNew.StopTime > 0 {
+						go models.AddCygxArticleHistoryRecord(historyRecord)
+					}
 				}
 			} else { //无该行业权限
 				hasPermission = 3

+ 20 - 17
controllers/tactics.go

@@ -206,24 +206,27 @@ func (this *TacticsController) Detail() {
 			}
 			if strings.Contains(companyPermission, articlePermissionPermissionName) {
 				hasPermission = 1
-				hasPermission = 1
-				detailNew, err := models.GetNewArticleHistoryRecord(uid, articleId)
-				if err != nil {
-					br.Msg = "获取信息失败"
-					br.ErrMsg = "获取信息失败,Err:" + err.Error()
-					return
-				}
-				recordCount, _ := models.GetNoAddStoptimeArticleCount(detailNew.Id)
-				if recordCount < 1 {
-					historyRecord := new(models.CygxArticleHistoryRecord)
-					historyRecord.UserId = uid
-					historyRecord.ArticleId = articleId
-					historyRecord.CreateTime = time.Now()
-					historyRecord.Mobile = user.Mobile
-					historyRecord.Email = user.Email
-					historyRecord.CompanyId = user.CompanyId
-					historyRecord.CompanyName = user.CompanyName
+				historyRecord := new(models.CygxArticleHistoryRecord)
+				historyRecord.UserId = uid
+				historyRecord.ArticleId = articleId
+				historyRecord.CreateTime = time.Now()
+				historyRecord.Mobile = user.Mobile
+				historyRecord.Email = user.Email
+				historyRecord.CompanyId = user.CompanyId
+				historyRecord.CompanyName = user.CompanyName
+				recordCount, _ := models.GetNoAddStoptimeArticleCount(uid, articleId)
+				if recordCount == 0 {
 					go models.AddCygxArticleHistoryRecord(historyRecord)
+				} else {
+					detailNew, err := models.GetNewArticleHistoryRecord(uid, articleId)
+					if err != nil {
+						br.Msg = "获取信息失败"
+						br.ErrMsg = "获取信息失败,Err:" + err.Error()
+						return
+					}
+					if detailNew.StopTime > 0 {
+						go models.AddCygxArticleHistoryRecord(historyRecord)
+					}
 				}
 			} else { //无该行业权限
 				hasPermission = 3

+ 4 - 4
models/article_history_record.go

@@ -100,10 +100,10 @@ func GetNewArticleHistoryRecord(uid, articleId int) (item *AddStopTimeNewRep, er
 }
 
 //获取用户阅读记录
-func GetNoAddStoptimeArticleCount(id int) (count int, err error) {
-	//sqlCount := `SELECT COUNT(1) AS count FROM cygx_article_history_record WHERE user_id=? AND article_id=? AND create_time > '` + utils.OnlineTime + `' AND stop_time = 0 `
-	sqlCount := `SELECT COUNT(1) AS count FROM cygx_article_history_record WHERE id = ? AND stop_time = 0 `
+func GetNoAddStoptimeArticleCount(uid, articleId int) (count int, err error) {
+	sqlCount := `SELECT COUNT(1) AS count FROM cygx_article_history_record WHERE user_id=? AND article_id=? AND create_time > '` + utils.OnlineTime + `' AND stop_time = 0 `
+	//sqlCount := `SELECT COUNT(1) AS count FROM cygx_article_history_record WHERE id = ? AND stop_time = 0 `
 	o := orm.NewOrm()
-	err = o.Raw(sqlCount, id).QueryRow(&count)
+	err = o.Raw(sqlCount, uid, articleId).QueryRow(&count)
 	return
 }