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

controllers/activity.go

@@ -1011,7 +1011,8 @@ func (this *ActivityCoAntroller) Detail() {
 				return
 			}
 			//yidongKwy := activityInfo.YidongActivityUrl
-			activityInfo.YidongActivityUrl = yidongLongLink + "?source=11&fromHz=true&tgc=" + ydTgc
+			//activityInfo.YidongActivityUrl = yidongLongLink + "?source=11&fromHz=true&tgc=" + ydTgc
+			activityInfo.YidongActivityUrl = yidongLongLink + "%26source=11%26fromHz=true%26tgc=" + ydTgc
 		}
 		//处理音频回放
 		var mapActivityId []int
@@ -3102,8 +3103,8 @@ func (this *ActivityCoAntroller) LabelTypeListV5() {
 	}
 
 	//userType = 1
-	//查询专项产业调研展示权限
-	if whichDay == "" {
+	//查询专项产业调研展示权限 仅对大套餐客户跟永续客户展示
+	if whichDay == "" && (userType == 1 || userType == 2) {
 		var condition string
 		condition = ` AND art.publish_status = 1  AND art.label != '' `
 		if isPower == 1 {
@@ -4124,7 +4125,7 @@ func (this *ActivityCoAntroller) LabelTypeListV6Pc() {
 		list[k].Resource = 1
 	}
 
-	if whichDay == "" {
+	if whichDay == "" && (userType == 1 || userType == 2) {
 		//查询专项产业调研展示权限
 		var condition string
 		condition = ` AND art.publish_status = 1  AND art.label != '' `

controllers/report.go

@@ -195,7 +195,7 @@ func (this *ReportController) IndustryList() {
 	}
 	// 推荐关注
 	if recommendFocus == 1 {
-		condition += ` AND man.recommended_index >= 50`
+		condition += ` AND man.recommended_index >= 80`
 	}
 
 	// 列表总数据量

models/send_company_user.go

@@ -79,7 +79,7 @@ func GetSendCompanyList(condition string) (items []*CompanyJson, err error) {
 					WHERE  a.company_id=cid
 					AND c.enabled = 1 
 					AND b.cygx_auth=1
-					AND c.status IN('正式','试用','冻结','流失')) AS permission
+					AND a.STATUS IN ( '正式', '试用', '永续' )) AS permission 
 		FROM
 			company_report_permission AS a
 			INNER JOIN chart_permission AS b ON a.chart_permission_id = b.chart_permission_id
@@ -128,7 +128,7 @@ func GetSendCompanyFiccList(condition string) (items []*CompanyJson, err error)
 				a.company_id = cid 
 				AND c.enabled = 1 
 				AND b.cygx_auth = 1 
-				AND c.STATUS IN ( '正式', '试用' ,'冻结','流失')) AS permission 
+				AND a.STATUS IN ( '正式', '试用', '永续' )) AS permission 
 		FROM
 			company_report_permission AS a
 			INNER JOIN chart_permission AS b ON a.chart_permission_id = b.chart_permission_id

services/send_company_user.go

@@ -146,7 +146,7 @@ func DotongbuShangHai(cont context.Context) (err error) {
 		}
 	}
 
-	condition = ` AND p.modify_time > ` + "'" + updateTime + "'"
+	condition = ` AND p.is_suspend = 0  AND p.modify_time > ` + "'" + updateTime + "'"
 	companyIds = strings.TrimRight(companyIds, ",")
 
 	fmt.Println("获取冻结跟流失的用户", len(listFreezeAndLoss))
@@ -165,7 +165,7 @@ func DotongbuShangHai(cont context.Context) (err error) {
 	//原有的公司如果新增了也同步
 	companyIds = strings.TrimRight(companyIds, ",")
 	if companyIds != "" {
-		condition = ` AND c.company_id  IN (` + companyIds + ")"
+		condition = ` AND p.is_suspend = 0  AND c.company_id  IN (` + companyIds + ")"
 		DotongbuShangHaApi(condition)
 	}
 

services/yidong.go

@@ -493,12 +493,13 @@ func GetYiDongOriginalLink(item *models.ActivityDetail) (yidongLongLink string,
 		return
 	}
 	lingLink := ApifoxModal.Result
-
-	slicelingLink := strings.Split(lingLink, "redirect_uri=")
-	//var shortLink string
-	if len(slicelingLink) > 1 {
-		lingLink = slicelingLink[len(slicelingLink)-1]
-	}
+	//fmt.Println(lingLink)
+	//
+	//slicelingLink := strings.Split(lingLink, "redirect_uri=")
+	////var shortLink string
+	//if len(slicelingLink) > 1 {
+	//	lingLink = slicelingLink[len(slicelingLink)-1]
+	//}
 	yidongLongLink = lingLink
 	return
 }