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

controllers/activity.go

@@ -691,7 +691,7 @@ func (this *ActivityCoAntroller) SignupAdd() {
 			return
 		}
 		if popupMsg != "" {
-			br.Msg = "报名失败！"
+			br.Msg = popupMsg
 			br.ErrMsg = fmt.Sprint("userId:", uid, "Activity:id", popupMsg)
 			return
 		}

controllers/article.go

@@ -432,6 +432,9 @@ Loop:
 			detail.ReportLink += "?token=" + chartUserTokenByMobile
 		}
 	}
+	if articleId < utils.SummaryArticleId {
+		detail.Abstract, _ = services.GetReportContentTextSubNew(detail.Abstract)
+	}
 	if detail.ArticleTypeId == 14 {
 		detail.IsApplyAppointmentExpert = true //判断文章类型是否属于专家访谈  查研观向11.0
 	}
@@ -1570,7 +1573,7 @@ func (this *ArticleCommonController) AddStopTimePublic() {
 						recordRedis.Email = user.Email
 						recordRedis.RealName = user.RealName
 						recordRedis.CompanyName = companyName
-						recordRedis.CreateTime = time.Now().Add(-time.Second * time.Duration(stopTime))
+						//recordRedis.CreateTime = time.Now().Add(-time.Second * time.Duration(stopTime))
 						go services.PushViewRecordNewRedisData(recordRedis, user.CompanyId)
 					} else {
 						go models.UpdateCygxArticleViewRecordNewpv(record, stopTime)

controllers/htgj.go

@@ -787,7 +787,7 @@ func (this *BaseHtgjController) AddStopTimePublic() {
 						recordRedis.Email = user.Email
 						recordRedis.RealName = user.RealName
 						recordRedis.CompanyName = companyName
-						recordRedis.CreateTime = time.Now().Add(-time.Second * time.Duration(stopTime))
+						//recordRedis.CreateTime = time.Now().Add(-time.Second * time.Duration(stopTime))
 						go services.PushViewRecordNewRedisData(recordRedis, user.CompanyId)
 					} else {
 						go models.UpdateCygxArticleViewRecordNewpv(record, stopTime)

controllers/tactics.go

@@ -107,6 +107,9 @@ func (this *TacticsController) List() {
 			return
 		}
 		resp.MatchTypeName = detail.MatchTypeName
+		if detail.MatchTypeName == "热点问答" {
+			resp.IsShowAbstract = true
+		}
 	}
 
 	for _, v := range list {

controllers/yanxuan_special.go

@@ -73,7 +73,7 @@ func (this *YanxuanSpecialController) List() {
 		if err != nil {
 			return
 		}
-		v.Content = services.AnnotationHtml(v.Content)
+		v.Content, _ = services.GetReportContentTextSubNew(v.Content)
 		if v.DocUrl != "" {
 			var docs []models.Doc
 			err := json.Unmarshal([]byte(v.DocUrl), &docs)

models/activity_attendance_detail.go

@@ -151,7 +151,7 @@ type WxUserOutboundMobile struct {
 }
 
 func GetWxUserOutboundMobile(mobileStr string) (item []*WxUserOutboundMobile, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := `SELECT u.real_name,u.mobile,u.outbound_mobile,u.company_id,p.company_name ,GROUP_CONCAT( DISTINCT p.seller_name SEPARATOR '/' ) AS seller_name
 			FROM wx_user as u 
 			INNER JOIN company_product AS p ON p.company_id = u.company_id 

models/page_history_record.go

@@ -61,7 +61,7 @@ func GetTimeLineRecordCount(userId, industrialManagementId int) (count int, err
 
 func GetTimeLineRecordItem(userId, industrialManagementId int) (item *CygxPageHistoryRecord, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM cygx_page_history_record WHERE user_id=? AND router = '/api/report/industry/ArticleList?PageSize=10&CurrentIndex=1&CategoryId=99999&IndustrialManagementId=` + strconv.Itoa(industrialManagementId) + `' ORDER BY create_time DESC LIMIT 1,1 `
+	sql := `SELECT * FROM cygx_page_history_record WHERE user_id=? AND router = '/api/report/industry/ArticleList?PageSize=10&CurrentIndex=1&CategoryId=99999&IndustrialManagementId=` + strconv.Itoa(industrialManagementId) + `' ORDER BY create_time DESC LIMIT 0,1 `
 	err = o.Raw(sql, userId).QueryRow(&item)
 	return
 }

models/tactics.go

@@ -120,6 +120,7 @@ type TacticsListResp struct {
 	MatchTypeName     string `description:"匹配类型"`
 	ChartPermissionId int    `description:"行业ID"`
 	CategoryImgUrlPc  string `description:"图片"`
+	IsShowAbstract    bool   `description:"是否展示摘要"`
 	List              []*ReportArticle
 }
 

models/user.go

@@ -355,14 +355,15 @@ func ChangeUserOutboundMobileByMobile(userId int) (err error) {
 }
 
 type UserWhiteList struct {
-	Mobile      string `description:"手机号码"`
-	RealName    string `description:"用户实际名称"`
-	CompanyName string `description:"公司名称"`
-	Permission  string `description:"拥有权限分类,多个用英文逗号分隔"`
-	CountryCode string `description:"区号"`
-	SellerName  string `description:"销售姓名"`
-	CreatedTime time.Time
-	Status      string `description:"客户状态'试用','永续','冻结','流失','正式','潜在'"`
+	Mobile         string `description:"手机号码"`
+	OutboundMobile string `description:"外呼手机号"`
+	RealName       string `description:"用户实际名称"`
+	CompanyName    string `description:"公司名称"`
+	Permission     string `description:"拥有权限分类,多个用英文逗号分隔"`
+	CountryCode    string `description:"区号"`
+	SellerName     string `description:"销售姓名"`
+	CreatedTime    time.Time
+	Status         string `description:"客户状态'试用','永续','冻结','流失','正式','潜在'"`
 }
 
 type UserWhiteListRep struct {

models/user_record.go

@@ -91,8 +91,8 @@ func ModifyUserRecordSessionKey(openId, sessionKey string) (err error) {
 // 根据用户id和平台id获取用户关系
 func GetUserRecordByMobile(platform int, bindAccount string) (item *OpenIdList, err error) {
 	var sql string
-	sql = `SELECT union_id,cygx_user_id AS user_id  FROM	cygx_user_record  WHERE	1 = 1  AND cygx_bind_account = ?`
-	err = orm.NewOrm().Raw(sql, platform, bindAccount).QueryRow(&item)
+	sql = `SELECT open_id,cygx_user_id AS user_id  FROM	cygx_user_record  WHERE	1 = 1  AND cygx_bind_account = ?`
+	err = orm.NewOrm().Raw(sql, bindAccount).QueryRow(&item)
 	return
 }
 

models/wx_user.go

@@ -579,7 +579,7 @@ func GetCygxCompanyUserUserInteraction(userIds string) (items []*CygxUserInterac
 				man.activity_id IN ( SELECT activity_id FROM cygx_activity_signup AS f WHERE f.user_id = u.user_id  AND label != '') 
 			) AS activity_label
 		FROM
-			cygx_page_history_record AS u WHERE  u.user_id IN( ` + userIds + `)  	GROUP BY u.user_id  `
+			cygx_user_label AS u WHERE  u.user_id IN( ` + userIds + `)  	GROUP BY u.user_id  `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }

models/wx_user_white.go

@@ -27,6 +27,16 @@ func AddWxUserWhite(item *WxUserWhite) (lastId int64, err error) {
 	return
 }
 
+// 批量添加
+func AddAddWxUserWhiteMulti(items []*WxUserWhite) (err error) {
+	o := orm.NewOrmUsingDB("weekly_report")
+	if len(items) > 0 {
+		//批量添加新的关注记录
+		_, err = o.InsertMulti(len(items), items)
+	}
+	return
+}
+
 // 获取用户手机号白名单
 func GetWxUserWhiteMobile() (mobileStr string, err error) {
 	sql := ` SELECT
@@ -132,7 +142,7 @@ func DeleteWxUserWhite(item *WxUserWhite) (err error) {
 	if item.Mobile != "" {
 		sql := ` DELETE FROM wx_user_white WHERE mobile = ?`
 		_, err = o.Raw(sql, item.Mobile).Exec()
-	} else {
+	} else if item.OutboundMobile != "" {
 		sql := ` DELETE FROM wx_user_white WHERE outbound_mobile = ?`
 		_, err = o.Raw(sql, item.OutboundMobile).Exec()
 	}

services/article.go

@@ -525,27 +525,40 @@ type UserViewRedisData struct {
 }
 
 type ReportViewRecord struct {
-	Id              int       `orm:"column(id);pk"`
-	UserId          int       `description:"用户id"`
-	ReportId        int       `description:"报告id"`
-	Mobile          string    `description:"手机号"`
-	Email           string    `description:"邮箱"`
-	RealName        string    `description:"用户实际姓名"`
-	CompanyName     string    `description:"公司名称"`
-	CreateTime      time.Time `description:"创建时间"`
-	StopTime        int       `json:"stop_time" description:"停留时间"`
-	ReportChapterId int       `json:"report_chapter_id" description:"章节ID"`
-	OutId           int       `json:"out_id" description:"记录ID"`
+	Id int `orm:"column(id);pk"`
+	//UserId          int       `json:"user_id" description:"用户ID"`
+	//ReportId        int       `description:"报告id"`
+	//Mobile          string    `description:"手机号"`
+	//Email           string    `description:"邮箱"`
+	//RealName        string    `description:"用户实际姓名"`
+	//CompanyName     string    `description:"公司名称"`
+	//CreateTime      time.Time `description:"创建时间"`
+	//StopTime        int       `json:"stop_time" description:"停留时间"`
+	//ReportChapterId int       `json:"report_chapter_id" description:"章节ID"`
+	//OutId           int       `json:"out_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"`
+	StopTime        int    `json:"stop_time" description:"停留时间"`
+	ReportChapterId int    `json:"report_chapter_id" description:"章节ID"`
+	OutId           int    `json:"out_id" description:"章节ID"`
 }
 
 // PushViewRecordNewRedisData 阅读数据加入到redis
 func PushViewRecordNewRedisData(reportViewRecord *ReportViewRecord, companyId int) bool {
 	data := &UserViewRedisData{
 		Mobile:          reportViewRecord.Mobile,
+		UserId:          reportViewRecord.UserId,
 		Email:           reportViewRecord.Email,
 		RealName:        reportViewRecord.RealName,
 		CompanyName:     reportViewRecord.CompanyName,
-		ViewTime:        reportViewRecord.CreateTime.Format(utils.FormatDateTime),
+		ViewTime:        reportViewRecord.ViewTime,
 		ProductId:       2,
 		CompanyId:       companyId,
 		ReportId:        reportViewRecord.ReportId,
@@ -553,6 +566,7 @@ func PushViewRecordNewRedisData(reportViewRecord *ReportViewRecord, companyId in
 		ReportChapterId: reportViewRecord.ReportChapterId,
 		OutId:           reportViewRecord.OutId,
 	}
+
 	if utils.Re == nil {
 		err := utils.Rc.LPush(utils.CACHE_KEY_USER_VIEW, data)
 		if err != nil {
@@ -731,12 +745,12 @@ func HandleArticleListByApi(artcleId int) (err error) {
 		fmt.Println("Getres.PublicGetDate Err:", err.Error())
 		return err
 	}
-	//item := new(models.CygxShanghaiCompanyLog)
-	//item.CreateTime = time.Now()
-	//item.Url = clueApiUrl
-	//item.Body = ""
-	//item.Result = string(body)
-	//go models.AddCygxShanghaiCompanyLog(item)
+	item := new(models.CygxShanghaiCompanyLog)
+	item.CreateTime = time.Now()
+	item.Url = clueApiUrl
+	item.Body = ""
+	item.Result = string(body)
+	go models.AddCygxShanghaiCompanyLog(item)
 	go models.UpdateCygxArticleCeluePush(artcleId)
 	articleResult := articleResultDate.Data
 

services/article_history.go

@@ -112,8 +112,9 @@ func ArticleHistoryStopTime(articleId, stopTime, outType int, user *models.WxUse
 		recordRedis.RealName = user.RealName
 		recordRedis.CompanyName = user.CompanyName
 		recordRedis.StopTime = stopTime
+		recordRedis.ViewTime = record.CreateTime.Format(utils.FormatDateTime)
 		recordRedis.OutId = int(newId)
-		recordRedis.CreateTime = time.Now()
+		//recordRedis.CreateTime = time.Now()
 		go PushViewRecordNewRedisData(recordRedis, user.CompanyId)
 		utils.Rc.Put(key, 1, 2*time.Second)
 	}

services/user.go

@@ -437,6 +437,7 @@ func SendEmailUserWhiteListChange(cont context.Context) (err error) {
 	//手机号新增
 	fieldStr = ` u.mobile,u.country_code,u.real_name,c.company_name,u.company_id,cp.seller_name,cp.status,`
 	condition = `  AND cp.status IN ( '正式', '试用' ) AND u.mobile IN (` + mobileStr + `) `
+	condition += ` AND  u.mobile !=''  AND DATE_SUB(CURDATE(), INTERVAL 2 DAY) <= DATE(u.created_time )`
 	listMobile, err := models.GetFormalUserWhiteList(fieldStr, condition)
 	if err != nil {
 		msg = "获取失败，Err:" + err.Error()
@@ -450,11 +451,13 @@ func SendEmailUserWhiteListChange(cont context.Context) (err error) {
 	outboundMobileStr = strings.Replace(outboundMobileStr, " ", "", -1)
 	fieldStr = ` u.outbound_mobile as mobile,u.outbound_country_code as country_code,u.real_name,c.company_name,u.company_id,cp.status,`
 	condition = `  AND cp.status IN ( '正式', '试用' ) AND u.outbound_mobile IN (` + outboundMobileStr + `) `
+	condition += `  AND DATE_SUB(CURDATE(), INTERVAL 2 DAY) <= DATE(u.created_time )`
 	listOutboundMobile, err := models.GetFormalUserWhiteList(fieldStr, condition)
 	if err != nil {
 		msg = "获取失败，Err:" + err.Error()
 		return
 	}
+
 	var rep models.UserWhiteListRep
 	var repList []*models.UserWhiteList
 	repList = listMobile
@@ -463,7 +466,16 @@ func SendEmailUserWhiteListChange(cont context.Context) (err error) {
 			repList = append(listMobile, v)
 		}
 	}
-	rep.List = repList
+
+	//新增用户，过滤手机号为空的
+	for _, v := range repList {
+		if v.Mobile == "" {
+			continue
+		}
+		rep.List = append(rep.List, v)
+	}
+
+	//rep.List = repList
 	//创建excel
 	dir, errFile := os.Executable()
 	exPath := filepath.Dir(dir)
@@ -640,17 +652,26 @@ func SendEmailUserWhiteListChange(cont context.Context) (err error) {
 	//手机号冻结
 	listFrozen, err := models.GetFrozenUserWhiteList()                 //手机号用户修改
 	listFrozenOutbound, err := models.GetFrozenUserWhiteListOutbound() //外呼手机号用户修改
+	if err != nil {
+		msg = "获取失败，Err:" + err.Error()
+		return
+	}
 	if len(listFrozenOutbound) > 0 {
 		for _, v := range listFrozenOutbound {
 			listFrozen = append(listFrozen, v)
 		}
 	}
-	if err != nil {
-		msg = "获取失败，Err:" + err.Error()
-		return
+
+	var listFrozenUser []*models.WxUserWhite
+	for _, v := range listFrozen {
+		if v.Mobile == "" {
+			continue
+		}
+		listFrozenUser = append(listFrozenUser, v)
 	}
-	if len(listFrozen) > 0 {
-		for _, item := range listFrozen {
+
+	if len(listFrozenUser) > 0 {
+		for _, item := range listFrozenUser {
 			row := sheet.AddRow()
 			cellA := row.AddCell()
 			cellA.Value = item.RealName
@@ -696,11 +717,10 @@ func SendEmailUserWhiteListChange(cont context.Context) (err error) {
 	content = time.Now().Format("2006-01-02") + "删除白名单用户"
 	fileName = downLoadnFilePaths
 	var sendResult2 bool
-	if len(listFrozen) > 0 {
+	if len(listFrozenOutbound) > 0 {
 		sendResult2 = utils.SendEmailByHongze(title, content, utils.EmaiWhiteUserList, fileName, title+".xlsx")
 	}
-	fmt.Println(sendResult2)
-	fmt.Println(sendResult)
+
 	os.Remove(downLoadnFilePaths)
 	//更新名单表
 	if sendResult {
@@ -726,6 +746,7 @@ func SendEmailUserWhiteListChange(cont context.Context) (err error) {
 		if len(listOutboundMobile) > 0 {
 			for _, v := range listOutboundMobile {
 				item := new(models.WxUserWhite)
+				item.Mobile = v.Mobile
 				item.OutboundMobile = v.Mobile
 				item.OutboundCountryCode = v.CountryCode
 				item.CreatedTime = time.Now()