Merge branch 'cygx_11.1' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/product_interior.go

@@ -121,7 +121,11 @@ func (this *ProductInteriorController) Detail() {
 	}
 	detail.PublishTime = utils.TimeRemoveHms2(detail.PublishTime)
 	resp.Detail = detail
-	detail.BodySlice = services.GetProductInteriorUrlBody(detail.Body)
+	detail.BodySlice, err = services.GetProductInteriorUrlBody(detail.Body, user)
+	if err != nil {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "获取用户权限信息失败,Err:" + err.Error()
+	}
 	go services.AddCygxProductInteriorHistory(user, productInteriorId)
 	br.Ret = 200
 	br.Success = true

controllers/user.go

@@ -869,8 +869,12 @@ func (this *UserController) ApplyTryOut() {
 	uid := user.UserId
 
 	var title string
+	var sourceId int
+	var source string
 	tryType := req.TryType
 	detailId := req.DetailId
+	sourceId = detailId
+	source = tryType
 	var isResearch bool // 是否属于研选
 	if tryType == "Article" {
 		detail, err := models.GetArticleDetailById(detailId)
@@ -903,6 +907,8 @@ func (this *UserController) ApplyTryOut() {
 			return
 		}
 		title = microAudio.VoiceName
+		sourceId = microAudio.ActivityId
+		source = "activityvoice"
 	} else if tryType == "MicroVideo" {
 		// 微路演视频
 		microVideo, e := models.GetMicroRoadshowVideoById(detailId)
@@ -1137,6 +1143,8 @@ func (this *UserController) ApplyTryOut() {
 		//如果是潜在客户就标记来源
 		item.InviteCompanySource = 2
 	}
+	item.SourceId = sourceId
+	item.Source = strings.ToLower(source)
 	item.RegisterPlatform = utils.REGISTER_PLATFORM
 	err = models.AddApplyRecord(item)
 	if err != nil {

models/activity_video.go

@@ -76,6 +76,13 @@ func GetCygxActivityVideoByActivityId(activityId int) (item *CygxActivityVideo,
 	return
 }
 
+// GetCygxActivityVideoByActivityId 获取活动视频
+func GetCygxActivityVideoReqByActivityId(activityId int) (item *CygxActivityVideoReq, err error) {
+	sql := `SELECT * FROM cygx_activity_video WHERE video_id = ? LIMIT 1 `
+	err = orm.NewOrm().Raw(sql, activityId).QueryRow(&item)
+	return
+}
+
 // GetCygxActivityVideoById 获取活动视频
 func GetCygxActivityVideoById(activityId int) (item *CygxActivityVideo, err error) {
 	sql := `SELECT * FROM cygx_activity_video WHERE video_id = ? LIMIT 1 `

models/apply_record.go

@@ -19,6 +19,8 @@ type CygxApplyRecord struct {
 	ApplyMethod         int       `description:"1:已付费客户申请试用，2:非客户申请试用"`
 	RegisterPlatform    int       `description:"来源 1小程序，2：网页"`
 	InviteCompanySource int       `description:"来源 1小程序，2：网页"`
+	SourceId            int       `description:"资源ID"`
+	Source              string    `description:"资源类型 报告 ：article 、图表 ：newchart、微路演 ：roadshow、活动 ：activity、活动视频：activityvideo、活动音频：activityvoice、专项调研活动：activityspecial"`
 }
 
 type CygxApplyRecordResp struct {

models/product_interior.go

@@ -88,10 +88,12 @@ type CygxProductInteriorResp struct {
 }
 
 type ProductInteriorUrlResp struct {
-	ChartPermissionId int    `description:"行业id"`
-	SourceId          int    `description:"资源ID"`
-	Type              int    `description:"类型：1普通文本，2：文章、3：活动、4：产业"`
-	Body              string `description:"内容"`
+	ChartPermissionId int                     `description:"行业id"`
+	SourceId          int                     `description:"资源ID"`
+	Type              int                     `description:"类型：1普通文本，2：文章、3：活动、4：产业"`
+	Body              string                  `description:"内容"`
+	ActivityVideo     *CygxActivityVideoReq   //活动视频
+	AuthInfo          *UserPermissionAuthInfo // 权限
 }
 
 // 获取数量

services/product_interior.go

@@ -1,6 +1,7 @@
 package services
 
 import (
+	"errors"
 	"fmt"
 	"hongze/hongze_cygx/models"
 	"hongze/hongze_cygx/utils"
@@ -41,13 +42,22 @@ func GetProductInteriorUrl(url string, urlMap map[string]string) (itemResp *mode
 }
 
 // GetProductInteriorUrl 处理产品内测中的连接并做跳转处理
-func GetProductInteriorUrlBody(body string) (itemResp []*models.ProductInteriorUrlResp) {
+func GetProductInteriorUrlBody(body string, user *models.WxUserItem) (itemResp []*models.ProductInteriorUrlResp, err error) {
 	//2：文章详情  https://web.hzinsights.com/material/info/8436
 	//3：活动详情  https://web.hzinsights.com/activity/detail/2701
 	//4：产业详情  https://web.hzinsights.com/indepth/info/20/79
-	material := "material/info"
-	activity := "activity/detail"
-	indepth := "indepth/info"
+
+	// 用户权限
+	authInfo, permissionArr, e := GetUserRaiPermissionInfo(user.UserId, user.CompanyId)
+	if e != nil {
+		err = errors.New("GetUserRaiPermissionInfo, Err: " + e.Error())
+		return
+	}
+
+	material := "material/info"     // 2：文章详情
+	activity := "activity/detail"   //3：活动详情
+	indepth := "indepth/info"       //4：产业详情
+	ctivityvideo := "ctivity/video" //5：活动音频
 
 	var randStrStart = "start_cygx_{|}"
 	var randStr = "start_cygx_{|}_end_cygx"
@@ -57,10 +67,9 @@ func GetProductInteriorUrlBody(body string) (itemResp []*models.ProductInteriorU
 	if match != nil {
 		for _, v := range match {
 			//过滤不相干的超链接
-			if !strings.Contains(v, material) && !strings.Contains(v, activity) && !strings.Contains(v, indepth) {
+			if !strings.Contains(v, material) && !strings.Contains(v, activity) && !strings.Contains(v, indepth) && !strings.Contains(v, ctivityvideo) {
 				continue
 			}
-			fmt.Println(v)
 			body = strings.Replace(body, fmt.Sprint("href=\"", v, "\""), "", -1)
 			body = strings.Replace(body, fmt.Sprint("<a >"), "", -1)
 			body = strings.Replace(body, fmt.Sprint("</a>"), "", -1)
@@ -68,7 +77,6 @@ func GetProductInteriorUrlBody(body string) (itemResp []*models.ProductInteriorU
 			urlMap[v] = v
 		}
 	}
-	fmt.Println(urlMap)
 	sliceBody := strings.Split(body, randStr)
 	var sliceBodyUrl []string
 	for _, v := range sliceBody {
@@ -101,6 +109,46 @@ func GetProductInteriorUrlBody(body string) (itemResp []*models.ProductInteriorU
 					item.ChartPermissionId = chartPermissionId
 				}
 				item.Type = 4
+			} else if strings.Contains(url, ctivityvideo) {
+				if lenurlSlice >= 2 {
+					chartPermissionId, _ := strconv.Atoi(urlSlice[lenurlSlice-2])
+					item.ChartPermissionId = chartPermissionId
+				}
+				item.Type = 5
+				activityVideo, e := models.GetCygxActivityVideoReqByActivityId(sourceId)
+				if e != nil {
+					err = errors.New("GetCygxActivityVideoReqByActivityId, Err: " + e.Error())
+					return
+				}
+				if activityVideo != nil {
+					item.ActivityVideo = activityVideo
+				}
+				activityInfo, e := models.GetAddActivityInfoById(sourceId)
+				if e != nil {
+					err = errors.New("GetAddActivityInfoById, Err: " + e.Error())
+					return
+				}
+				// 权限
+				au := new(models.UserPermissionAuthInfo)
+				au.SellerName = authInfo.SellerName
+				au.SellerMobile = authInfo.SellerMobile
+				au.HasPermission = authInfo.HasPermission
+				au.OperationMode = authInfo.OperationMode
+				if au.HasPermission == 1 {
+					// 非宏观权限进一步判断是否有权限
+					if activityInfo.ChartPermissionId != utils.HONG_GUAN_ID && !utils.InArrayByStr(permissionArr, activityInfo.ChartPermissionName) {
+						au.HasPermission = 2
+					}
+				}
+				// 无权限的弹框提示
+				if au.HasPermission != 1 {
+					if au.OperationMode == UserPermissionOperationModeCall {
+						au.PopupMsg = UserPermissionPopupMsgCallMicroVideo
+					} else {
+						au.PopupMsg = UserPermissionPopupMsgApplyActivity
+					}
+				}
+				item.AuthInfo = au
 			}
 		}
 		itemResp = append(itemResp, item)