Browse Source

no message

xingzai 3 years ago
parent
commit
4beb2e716b
4 changed files with 41 additions and 60 deletions
  1. 19 17
      controllers/article.go
  2. 0 26
      controllers/wechat.go
  3. 1 1
      models/article_history_record.go
  4. 21 16
      services/article.go

+ 19 - 17
controllers/article.go

@@ -219,11 +219,9 @@ func (this *ArticleController) Detail() {
 			br.ErrMsg = "获取销售数据失败,Err:" + err.Error() + strconv.Itoa(uid) + ";articleId" + strconv.Itoa(articleId)
 			return
 		}
-		fmt.Println(detail.SellerAndMobile)
 		if detail.ArticleId >= utils.SummaryArticleId && strings.Contains(detail.SellerAndMobile, "-") {
 			strnum := strings.Index(detail.SellerAndMobile, "-")
 			detail.SellerAndMobile = detail.SellerAndMobile[0:strnum]
-			fmt.Println(detail.SellerAndMobile)
 			if strnum > 0 {
 				nickName := detail.SellerAndMobile[0:strnum]
 				sellerAndMobile := &models.SellerRep{
@@ -608,37 +606,41 @@ func (this *ArticleController) AddStopTime() {
 			}
 			if hasPersion {
 				detailNew, err := models.GetNewArticleHistoryRecord(uid, articleId)
+				fmt.Println(detailNew)
+				fmt.Println(err)
 				if err == nil {
+					fmt.Println("修改")
 					hasPermission = 1
 					historyRecord := new(models.AddStopTimeNewRep)
 					historyRecord.StopTime = detailNew.StopTime + stopTime
 					historyRecord.Id = detailNew.Id
 					historyRecord.OutType = outType
-					go models.AddArticleStopTime(historyRecord)
+					go models.UpdateArticleStopTime(historyRecord)
 				}
 
-				key := "CYGX_ARTICLE_PV" + strconv.Itoa(articleId) + "_" + strconv.Itoa(uid) + "_" + strconv.Itoa(user.CompanyId)
-				record := new(models.CygxArticleHistoryRecordNewpv)
-				record.UserId = uid
-				record.ArticleId = articleId
-				record.CreateTime = time.Now()
-				record.ModifyTime = time.Now()
-				record.Mobile = user.Mobile
-				record.Email = user.Email
-				record.CompanyId = user.CompanyId
-				record.CompanyName = user.CompanyName
-				record.StopTime = stopTime
-				record.OutType = outType
 				//不统计本公司的阅读记录、正常退出的不做时间差统计
 				if user.CompanyId != 16 {
-					if !utils.Rc.IsExist(key) || req.OutType != 2 {
+					key := "CYGX_ARTICLE_PV" + strconv.Itoa(articleId) + "_" + strconv.Itoa(uid) + "_" + strconv.Itoa(user.CompanyId) + "_" + strconv.Itoa(outType)
+					record := new(models.CygxArticleHistoryRecordNewpv)
+					record.UserId = uid
+					record.ArticleId = articleId
+					record.CreateTime = time.Now()
+					record.ModifyTime = time.Now()
+					record.Mobile = user.Mobile
+					record.Email = user.Email
+					record.CompanyId = user.CompanyId
+					record.CompanyName = user.CompanyName
+					record.StopTime = stopTime
+					record.OutType = outType
+					if !utils.Rc.IsExist(key) || outType != 2 {
 						//新增浏览记录
 						go models.AddCygxArticleViewRecordNewpv(record)
 					} else {
 						go models.UpdateCygxArticleViewRecordNewpv(record, stopTime)
 					}
+					utils.Rc.Put(key, 1, 10*time.Minute)
 				}
-				utils.Rc.Put(key, 1, 10*time.Minute)
+
 				models.ModifyReportLastViewTime(uid)
 			} else { //无该行业权限
 				hasPermission = 3

+ 0 - 26
controllers/wechat.go

@@ -624,32 +624,6 @@ func (this *WechatController) GetEmailCode() {
 	br.Success = true
 }
 
-//
-//func init() {
-//	fmt.Println("start")
-//	sessionKey:=`CBDTrqAe0z8uvC8gFd3lJw==`
-//	rawData:=`{"nickName":"freedom","gender":0,"language":"zh_CN","city":"","province":"","country":"","avatarUrl":"https://thirdwx.qlogo.cn/mmopen/vi_32/RsZCoxzBXkoeKlKjCkWPh8DR88rtD9PlOYLB7NaFsOmwQr2DOic3m9nh2azEnkZD2mzHZ7lf0oJ53Fh8ARQr9vA/132"}`
-//	encryptedData:=`OuyYSyhocFgQSj68B4MVvJYJdLCJkSdSu0TuCU+nhcRB6Vzji8e7v/5nDJHsRLopEzUvi/fcUdJKoUtDap08kIxfFsvxKTRXn2OeaCams8Wf6dE4N27HaSpq91Ykfq7Zm33WJJi/PK4kn86t/2a1bBe2FQRrcLH40cLveglPn88MDC0N4cJ119Ab8V4OhTzIbeUNWtlD883GQL7saSsPBsiGhd4a8qoHVmQiZGVjjRJ0vH9X2K404MNKi0kmtcmTGTiecTptY/nf2ZOwohnVYFXVg6C2qFwpZw2ozRNRs7mBzBK818SBM8MHvS6gRuTwkc27/Yhn/7SH4Gq/DTDBoseEa/RENZJdYi1OqRSuS9q+qb5kfvf8GB8I6g+rA35oxvwdqhA3iyotzh91znHr1LMyqPg/ol59TL8T1GYh9ppcg5rrkgywmlF9N+YWaSqpruB9VUxoieKjZNtre1aq1GZAnxY7bwoe7a7u1Uu6vVpnP2kScJC2zK4IgmBExV4/`
-//
-//	signature:=`a1a8a81ae75388bcbb66d92a6682ef4d16d4f634`
-//	iv:=`ibri5rJxiWOT0Ar/6AfUXw==`
-//	userInfo, err := weapp.DecryptUserInfo(sessionKey, rawData, encryptedData,signature, iv)
-//	fmt.Println(userInfo)
-//	fmt.Println(err)
-//	fmt.Println("end")
-//}
-
-//func init() {
-//	sessionKey:=`zkHYyjTv2kNQgXyIVYC3cQ==`
-//	rowData:=`{nickName:rdluck,gender:1,language:zh_CN,city:Wuhan,province:Hubei,country:China,avatarUrl:https://thirdwx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTJGUvpic2UAQC8Zm8WZg5V9xJtdXDLHpS6VMiaxibzDEXyYoDsXa3F2sXiaegd5lhSbcwMHibwXqTzichww/132}`
-//	encyData:=`3vg6rtKN2oqdOKRi9fV9sUgBQTgA9ndo2WHEtLSmKofLW4BFKr1AQdAeyzNtPNPIr73vt6hVUt2VzMLTeZWlS1CXBVON8xb5heVhF6RUxXtSbPje2BUYZ HjGthXZ1kkiXs89KD/SsZJ7V0YDz7RB9VQwUROLHz8mCXBXvFa j80BIO637M0wIgU1GQ1tlxoVKedV1Z85FMpSuqGEVPRwyzaVkBeSr6o5zhnMF/O2t4sHb2 mHYCh9i1ssPzpygeOsXzaR5IU/a52bDBHYSEhXi4G79dsTvTKPTOEbaeNOosxx aZiG UNDTZ9hI9tJHhdib0QTCtNhIQpgaEzaFSymj0Dnea1LZN/jx4AyiF U6GX7TOkSFyVNECLJ2HofHet3 Kw3eZ9g4SJHIXwmKUoyEXENjeZScXxs llnfskQEsz4Iibss05/23AS7q4hbTeRD0fsf1jU43qEYjvuyXEFQInKO2kmG1fX0QnFE6UsD5BFtjwUX2yhgrWCBdrrdrcnF5JQBDLtMxY8MGprd0A==`
-//	sign:=`c70a5d08e8aec0b26a80078d1a6d46ae17acb46a`
-//	iv:=`0 NP9YFMj3gURHG8wwHNgQ==`
-//	userInfo,err:=weapp.DecryptUserInfo(sessionKey,rowData, encyData, sign, iv)
-//	fmt.Println(err)
-//	fmt.Println(userInfo)
-//}
-
 // @Title 更新微信token
 // @Description 更新微信token
 // @Success Ret=200 更新成功

+ 1 - 1
models/article_history_record.go

@@ -80,7 +80,7 @@ type ArticleDetailAddStopTimeRep struct {
 	HasFree       int `description:"1:已付费(至少包含一个品类的权限),2:未付费(没有任何品类权限)"`
 }
 
-func AddArticleStopTime(item *AddStopTimeNewRep) (err error) {
+func UpdateArticleStopTime(item *AddStopTimeNewRep) (err error) {
 	o := orm.NewOrm()
 	sql := `UPDATE cygx_article_history_record SET stop_time = ?,out_type = ? WHERE id =?`
 	_, err = o.Raw(sql, item.StopTime, item.OutType, item.Id).Exec()

+ 21 - 16
services/article.go

@@ -566,23 +566,28 @@ func SynchronizationArtclehistory() {
 	}
 	fmt.Println(len(list))
 	for _, v := range list {
-		endDate := v.ModifyTime.Add(+time.Minute * 10).Format(utils.FormatDateTime)
-		detail, err := models.GetNewArticleHistoryRecordNewpv(v.UserId, v.ArticleId, endDate)
-		if err != nil && err.Error() != utils.ErrNoRow() {
-			fmt.Println("获取信息失败", err)
-		}
+		//endDate := v.ModifyTime.Add(+time.Minute * 10).Format(utils.FormatDateTime)
+		//detail, err := models.GetNewArticleHistoryRecordNewpv(v.UserId, v.ArticleId, endDate)
+		//if err != nil && err.Error() != utils.ErrNoRow() {
+		//	fmt.Println("获取信息失败", err)
+		//}
 		v.OutType = 1
-		fmt.Println(v.Id)
-		if detail == nil {
-			_, err = models.AddCygxArticleViewRecordNewpv(v)
-			if err != nil {
-				fmt.Println("新增失败", err)
-			}
-		} else {
-			err = models.UpdateCygxArticleViewRecordNewpvList(v, v.StopTime)
-			if err != nil {
-				fmt.Println("修改失败", err)
-			}
+		//fmt.Println(v.Id)
+		//if detail == nil {
+		//	_, err = models.AddCygxArticleViewRecordNewpv(v)
+		//	if err != nil {
+		//		fmt.Println("新增失败", err)
+		//	}
+		//} else {
+		//	err = models.UpdateCygxArticleViewRecordNewpvList(v, v.StopTime)
+		//	if err != nil {
+		//		fmt.Println("修改失败", err)
+		//	}
+		//}
+		newId, err := models.AddCygxArticleViewRecordNewpv(v)
+		fmt.Println("新增", newId)
+		if err != nil {
+			fmt.Println("新增失败", err)
 		}
 	}
 	fmt.Println("同步结束")