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

controllers/article.go

@@ -647,28 +647,18 @@ func (this *ArticleControllerMobile) DetailMd5() {
 			}
 			if hasPersion {
 				hasPermission = 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
-				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)
-					}
-				}
+				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
+				//新增浏览记录
+				go models.AddCygxArticleViewRecordNewpv(record)
+
 				//30分钟之内阅读同一篇文章不错二次推送
 				key := "CYGX_ARTICLE_READ" + strconv.Itoa(articleId) + "_" + strconv.Itoa(uid)
 				if !utils.Rc.IsExist(key) {

controllers/chart.go

@@ -205,7 +205,7 @@ func (this *ChartController) Detail() {
 			return
 		}
 		detail.IsCollection = GetIsCollectionChart
-		detail.HttpUrl += "?token=" + chartUserTokenByMobile
+		detail.HttpUrl = utils.CHART_INFO_HTTP_URL + strconv.Itoa(chartId) + "?token=" + chartUserTokenByMobile
 		//if !detail.IsCollection {
 		//	err = models.RemoveChartCollect(user.UserId, chartId)
 		//}

controllers/home.go

@@ -464,7 +464,7 @@ func (this *HomeController) ListHomeArtAndChart() {
 			page = paging.GetPaging(currentIndex, pageSize, total)
 			if categoryId != "" {
 				condition += ` AND category_id IN(` + categoryId + `)`
-				condition += ` OR ( category_name  LIKE '%` + utils.CHART_PERMISSION_NAME_YANXUAN + `%' AND publish_status = 1 AND is_summary = 1 )`
+				//condition += ` OR ( category_name  LIKE '%` + utils.CHART_PERMISSION_NAME_YANXUAN + `%' AND publish_status = 1 AND is_summary = 1 )`
 			} else {
 				condition += ` AND  category_name   LIKE '%` + utils.CHART_PERMISSION_NAME_YANXUAN + `%'`
 			}

controllers/report.go

@@ -2253,7 +2253,7 @@ func (this *ReportController) SearchReport() {
 	var condition string
 	var sqlGroup string
 	//匹配报告标题、
-	condition = `AND ( a.title LIKE '%` + keyWord + `%' OR  a.body LIKE '%` + keyWord + `%') `
+	condition = `AND ( a.title LIKE '%` + keyWord + `%' OR  a.body LIKE '%` + keyWord + `%') AND a.publish_status = 1 `
 	sqlGroup = ` GROUP BY  a.article_id  ORDER BY a.publish_date DESC  `
 	//对应产业名称、标的名称。
 	//OR a.article_id IN ( SELECT article_id FROM cygx_industrial_article_group_subject WHERE industrial_subject_id IN ( SELECT industrial_subject_id FROM cygx_industrial_subject WHERE subject_name LIKE '%` + keyWord + `%' ) )

models/celue_article_history_record.go

@@ -17,7 +17,7 @@ type CeLueArticleResultApi struct {
 type CeLueArticleResultApidate struct {
 	CelueHistoryId int      `json:"id"`
 	Mobile         string   `json:"phone_number"`
-	ArticleId      string   `json:"parameter"`
+	ArticleId      string   `json:"entity_info"`
 	CreateDate     string   `json:"access_time"`
 	CrmUser        *CrmUser `json:"user"`
 	CompanyName    *CrmUser `json:"crm_company"`

models/chart.go

@@ -268,7 +268,7 @@ func GetChartDetailById(chartId, uid int) (item *CygxChartDetail, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT * ,( SELECT COUNT( 1 ) FROM cygx_chart_collect AS c WHERE c.chart_id = a.chart_id AND c.user_id = ? ) AS collection_num
 		FROM
-			cygx_chart  as a 
+			cygx_chart_all  as a 
 		WHERE
 			a.chart_id =? `
 	err = o.Raw(sql, uid, chartId).QueryRow(&item)

models/send_company_user.go

@@ -225,7 +225,13 @@ type WxUserOpLogResp struct {
 //获取指定时间内更新的用户
 func GetWxUserOpLog(createTime string) (items []*WxUserOpLogResp, err error) {
 	o := orm.NewOrm()
-	sql := ` SELECT company_id FROM wx_user_op_log WHERE  log_type IN ('add','edit','import','move') AND create_time >=  '` + createTime + `' AND company_id > 1 GROUP BY company_id `
+	sql := ` SELECT
+			u.company_id 
+		FROM
+			wx_user_op_log AS l
+			INNER JOIN wx_user AS u ON u.mobile = l.mobile 
+		WHERE
+			l.log_type IN ( 'add', 'edit', 'import', 'move' )  AND create_time >=  '` + createTime + `'  GROUP BY u.company_id `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }

services/chart.go

@@ -301,7 +301,7 @@ func GetChartCollectionByApi(mobile string, take, skip int) (items []*models.Hom
 		item.PtagName = v.ChartInfo.Ptag.Name
 		item.CtagName = v.ChartInfo.Ctag.Name
 		item.BodyHtml = v.ChartInfo.Cover
-		item.HttpUrl = "https://vmp.hzinsights.com/v2/charts/" + strconv.Itoa(v.ChartId)
+		item.HttpUrl = utils.CHART_INFO_HTTP_URL + strconv.Itoa(v.ChartId)
 		item.IsNeedJump = true
 		items = append(items, item)
 	}

utils/constants.go

@@ -78,3 +78,7 @@ const (
 	C_CLASS_ACTIVITY_TYPE_ID         = 7 //C类电话会会议ID
 	ANALYST_TELL_ACTIVITY_TYPE_ID    = 2 //分析师电话会ID
 )
+
+const (
+	CHART_INFO_HTTP_URL = "https://vmp.hzinsights.com/v2/charts/"
+)