Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into cygx_v2

controllers/article.go

@@ -543,7 +543,7 @@ func (this *ArticleController) AddStopTime() {
 		detail, err = models.GetArticleDetailById(articleId)
 		if err != nil {
 			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取信息失败,Err:" + err.Error()
+			br.ErrMsg = "获取文章信息失败,Err:" + err.Error() + strconv.Itoa(uid) + ";articleId" + strconv.Itoa(articleId)
 			return
 		}
 		if companyPermission == "" {
@@ -576,16 +576,17 @@ func (this *ArticleController) AddStopTime() {
 
 			if strings.Contains(companyPermission, articlePermissionPermissionName) {
 				detailNew, err := models.GetNewArticleHistoryRecord(uid, articleId)
-				if err != nil {
-					br.Msg = "获取信息失败"
-					br.ErrMsg = "获取信息失败,Err:" + err.Error()
-					return
+				if err == nil {
+					//br.Msg = "获取信息失败"
+					//br.ErrMsg = "获取最新阅读信息失败,Err:" + err.Error() + strconv.Itoa(uid) + ";articleId" + strconv.Itoa(articleId)
+					//return
+					hasPermission = 1
+					historyRecord := new(models.AddStopTimeNewRep)
+					historyRecord.StopTime = detailNew.StopTime + stopTime
+					historyRecord.Id = detailNew.Id
+					go models.AddArticleStopTime(historyRecord)
 				}
-				hasPermission = 1
-				historyRecord := new(models.AddStopTimeNewRep)
-				historyRecord.StopTime = detailNew.StopTime + stopTime
-				historyRecord.Id = detailNew.Id
-				go models.AddArticleStopTime(historyRecord)
+
 			} else { //无该行业权限
 				hasPermission = 3
 			}

models/company.go

@@ -57,7 +57,7 @@ func GetCompanyDetailAllById(companyId int) (item *CompanyDetail, err error) {
             FROM company AS a
 			INNER JOIN company_product AS b ON a.company_id=b.company_id
 			LEFT JOIN admin AS c ON b.seller_id=c.admin_id
-			WHERE a.company_id=? `
+			WHERE a.company_id=?  AND b.status IN('正式','试用','永续')`
 	o := orm.NewOrm()
 	err = o.Raw(sql, companyId).QueryRow(&item)
 	return

utils/config.go

@@ -76,7 +76,7 @@ func init() {
 		WxPublicId = "gh_b67e0049fb8c"
 		//IndexName="cygx_article_v1"
 		//IndexName = "cygx_article_v2"
-		IndexName = "cygx_article_v3"
+		IndexName = "cygx_article_v5"
 	} else {
 		WxAppId = "wxcc32b61f96720d2f"
 		WxAppSecret = "06894933fafb24dafead7eaae09c08e0"