Merge branch 'cygx/mfyx_3.6' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/cygx/activity.go

@@ -655,6 +655,7 @@ func (this *ActivityCoAntroller) PreserveAndPublish() {
 				//音频 目前只有一个
 				itemVoice := new(cygx.CygxActivityVoice)
 				//var itemVoiceList []*cygx.CygxActivityVoice
+				var sourceVivo string // 音视频文件类型
 				if len(voiceList) > 0 {
 					for _, vo := range voiceList {
 						itemVoice.ActivityId = activityId
@@ -664,6 +665,7 @@ func (this *ActivityCoAntroller) PreserveAndPublish() {
 						itemVoice.BackgroundImg = req.BackgroundImg
 						itemVoice.ShareImg = req.ShareImg
 						itemVoice.CreateTime = time.Now()
+						sourceVivo = utils.CYGX_OBJ_ACTIVITYVOICE
 					}
 				}
 				//视频
@@ -677,6 +679,7 @@ func (this *ActivityCoAntroller) PreserveAndPublish() {
 					itemVideo.ShareImg = req.ShareImg
 					itemVideo.ModifyDate = time.Now().Format(utils.FormatDateTime)
 					itemVideo.CreateTime = time.Now().Format(utils.FormatDateTime)
+					sourceVivo = utils.CYGX_OBJ_ACTIVITYVIDEO
 				}
 				//删除原有的视频数据
 				//if itemVideo.VideoUrl != "" {
@@ -698,7 +701,7 @@ func (this *ActivityCoAntroller) PreserveAndPublish() {
 					return
 				}
 
-				err = cygxService.UpdateActivityVivoPointsSet(activityInfo, vivoPointsSet, itemPointsSet)
+				err = cygxService.UpdateActivityVivoPointsSet(activityInfo, vivoPointsSet, itemPointsSet, sourceVivo)
 				if err != nil {
 					br.Msg = "获取信息失败"
 					br.ErrMsg = "UpdateActivityVideoAndVoice，Err:" + err.Error() + "activityId：" + strconv.Itoa(activityId)

controllers/cygx/activity_video.go

@@ -434,6 +434,7 @@ func (this *ActivityVideoCoAntroller) VideoAndVoice() {
 // @Param   KeyWord   query   string  false       "搜索关键词"
 // @Param   SortType          query   string    false		"排序顺序：asc、desc"
 // @Param   SearchType          query   int    false		"类型 1 路演回放 ，2：调研反馈"
+// @Param   IsResearch   query   bool  true       "是否为研选"
 // @Success 200 {object} cygx.CygxActivityVideoListRep
 // @router /activity_voice_and_video/list [get]
 func (this *ActivityVideoCoAntroller) ActivityVoiceAndVideoList() {
@@ -458,6 +459,7 @@ func (this *ActivityVideoCoAntroller) ActivityVoiceAndVideoList() {
 	endDate := this.GetString("EndDate")
 	keyWord := this.GetString("KeyWord")
 	sortType := this.GetString("SortType")
+	isResearch, _ := this.GetBool("IsResearch")
 
 	var startSize int
 	if pageSize <= 0 {
@@ -475,6 +477,13 @@ func (this *ActivityVideoCoAntroller) ActivityVoiceAndVideoList() {
 		conditionVideo += ` AND (v.video_name LIKE '%` + keyWord + `%' )  `
 		conditionVoice += ` AND (v.voice_name LIKE '%` + keyWord + `%' )  `
 	}
+
+	if isResearch {
+		chartPermissionId = utils.CHART_PERMISSION_ID_YANXUAN //如果是研选添加一个研选行业的筛选
+	} else {
+		condition += ` AND art.chart_permission_id  != ?  `
+		pars = append(pars, utils.CHART_PERMISSION_ID_YANXUAN)
+	}
 	//行业名称
 	if chartPermissionId > 0 {
 		condition += ` AND art.chart_permission_id  = ?  `
@@ -552,7 +561,7 @@ func (this *ActivityVideoCoAntroller) ActivityVoiceAndVideoList() {
 
 		//处理音视文件标识
 		mapVoice := make(map[int]bool)
-		var conditionVoice string
+		//var conditionVoice string
 		var parsVoice []interface{}
 		conditionVoice = " AND activity_id IN (" + activityIds + ")  "
 		listVoice, err := cygx.GetActivityVoiceList(conditionVoice, parsVoice)

controllers/cygx/order.go

@@ -161,6 +161,10 @@ func (this *OrderController) OrderList() {
 			item.HttpUrl = utils.CYGX_MFYX_URL + "/material/info/" + strconv.Itoa(v.SourceId)
 		case utils.CYGX_OBJ_ACTIVITY: //活动详情
 			item.HttpUrl = utils.CYGX_MFYX_URL + "/activity/detail/" + strconv.Itoa(v.SourceId)
+		case utils.CYGX_OBJ_ACTIVITYVIDEO: //活动视频
+			item.HttpUrl = utils.CYGX_MFYX_URL + "/activity/detail/" + strconv.Itoa(v.SourceId)
+		case utils.CYGX_OBJ_ACTIVITYVOICE: //活动音频
+			item.HttpUrl = utils.CYGX_MFYX_URL + "/activity/detail/" + strconv.Itoa(v.SourceId)
 		case utils.CYGX_OBJ_YANXUANSPECIAL: //专栏详情
 			item.HttpUrl = utils.CYGX_MFYX_URL + "/column/detail/" + strconv.Itoa(v.SourceId)
 		}
@@ -447,6 +451,10 @@ func (this *OrderController) OrderRefundList() {
 		case utils.CYGX_OBJ_ARTICLE: //文章详情
 			item.HttpUrl = utils.CYGX_MFYX_URL + "/material/info/" + strconv.Itoa(v.SourceId)
 		case utils.CYGX_OBJ_ACTIVITY: //活动详情
+		case utils.CYGX_OBJ_ACTIVITYVIDEO: //活动视频
+			item.HttpUrl = utils.CYGX_MFYX_URL + "/activity/detail/" + strconv.Itoa(v.SourceId)
+		case utils.CYGX_OBJ_ACTIVITYVOICE: //活动音频
+			item.HttpUrl = utils.CYGX_MFYX_URL + "/activity/detail/" + strconv.Itoa(v.SourceId)
 			item.HttpUrl = utils.CYGX_MFYX_URL + "/activity/detail/" + strconv.Itoa(v.SourceId)
 		case utils.CYGX_OBJ_YANXUANSPECIAL: //专栏详情
 			item.HttpUrl = utils.CYGX_MFYX_URL + "/column/detail/" + strconv.Itoa(v.SourceId)

controllers/cygx/user_admin_share_history.go

@@ -70,10 +70,10 @@ func (this *UserAdminShareHistoryController) OrderList() {
 	}
 
 	//用户行为搜索
-	if action == "查看专栏" || action == "查看报告" || action == "查看活动" || action == "注册" {
-		condition += " 	AND action = ? "
-		pars = append(pars, action)
-	}
+	//if action == "查看专栏" || action == "查看报告" || action == "查看活动" || action == "注册" {
+	condition += " 	AND action = ? "
+	pars = append(pars, action)
+	//}
 
 	//如果不是权益管理员和admin，就做可见权限限制
 	if sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_RAI_ADMIN && sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_ADMIN {
@@ -119,7 +119,7 @@ func (this *UserAdminShareHistoryController) OrderList() {
 		switch v.Source {
 		case utils.CYGX_OBJ_ARTICLE: //文章详情
 			v.HttpUrl = utils.CYGX_MFYX_URL + "/material/info/" + strconv.Itoa(v.SourceId)
-		case utils.CYGX_OBJ_ACTIVITY: //活动详情
+		case utils.CYGX_OBJ_ACTIVITY, utils.CYGX_OBJ_ACTIVITYVIDEO, utils.CYGX_OBJ_ACTIVITYVOICE: //活动详情
 			v.HttpUrl = utils.CYGX_MFYX_URL + "/activity/detail/" + strconv.Itoa(v.SourceId)
 		case utils.CYGX_OBJ_YANXUANSPECIAL: //研选专栏
 			v.HttpUrl = utils.CYGX_MFYX_URL + "/column/detail/" + strconv.Itoa(v.SourceId)

models/cygx/activity_vivo_points_set.go

@@ -11,6 +11,7 @@ type CygxActivityVivoPointsSet struct {
 	PointsObject string    `comment:"扣点设置方式 1:同报名参会时的扣点数、2：输入其余点数"`
 	PointsNum    float64   `comment:"扣点数量"`
 	GoodsMoney   float64   `comment:"商品总价"`
+	Source       string    `comment:"来源 activityvideo 活动视频、activityvoice 活动音频"`
 	CreateTime   time.Time `comment:"创建时间"`
 	ModifyTime   time.Time `comment:"更新时间"`
 }
@@ -44,6 +45,7 @@ func EditCygxActivityVivoPointsSet(item *CygxActivityVivoPointsSet) (err error)
 	updateParams["PointsObject"] = item.PointsObject
 	updateParams["PointsNum"] = item.PointsNum
 	updateParams["GoodsMoney"] = item.GoodsMoney
+	updateParams["Source"] = item.Source
 	updateParams["ModifyTime"] = time.Now()
 	ptrStructOrTableName := "cygx_activity_vivo_points_set"
 	whereParam := map[string]interface{}{"activity_id": item.ActivityId}

services/cygx/activity_points_set.go

@@ -402,11 +402,14 @@ func init0703() {
 	fmt.Println(err)
 }
 
-func UpdateActivityVivoPointsSet(activityInfo *cygx.ActivityDetail, vivoPointsSet cygx.CygxActivityVivoPointsSetReq, itemPointsSet *cygx.CygxActivityPointsSet) (err error) {
+func UpdateActivityVivoPointsSet(activityInfo *cygx.ActivityDetail, vivoPointsSet cygx.CygxActivityVivoPointsSetReq, itemPointsSet *cygx.CygxActivityPointsSet, sourceVivo string) (err error) {
 	activityId := activityInfo.ActivityId
 	if vivoPointsSet.IsPay == 0 {
 		return
 	}
+	if sourceVivo == "" {
+		return
+	}
 	total, e := cygx.GetCygxActivityVivoPointsSetCountByActivityId(activityId)
 	if e != nil {
 		err = errors.New("GetCygxActivityVivoPointsSetCountByActivityId, Err: " + e.Error())
@@ -417,6 +420,7 @@ func UpdateActivityVivoPointsSet(activityInfo *cygx.ActivityDetail, vivoPointsSe
 	item.PointsObject = vivoPointsSet.PointsObject
 	item.PointsNum = vivoPointsSet.PointsNum
 	item.GoodsMoney = vivoPointsSet.GoodsMoney
+	item.Source = sourceVivo
 	item.CreateTime = time.Now()
 	item.ModifyTime = time.Now()
 	if total == 0 {