Merge branch 'mfyx_3.6' of http://8.136.199.33:3000/cxzhang/hongze_mfyx into debug

models/micro_roadshow.go

@@ -61,6 +61,7 @@ type MicroRoadShowPageList struct {
 	PlaySeconds         string `description:"音视频时长"`
 	ActivityId          int    `description:"活动ID"`
 	IsCollect           bool   `description:"是否收藏"`
+	LabelKeywordImgLink string `description:"标签关键词ico"`
 	AuthInfo            *UserPermissionAuthInfo
 }
 

models/order/order_virtual_asset.go

@@ -103,10 +103,10 @@ func AddCygxOrderVirtualAsset(item *CygxOrderVirtualAsset, itemOrder *CygxOrder)
 }
 
 // 获取数量
-func GetCygxOrderVirtualAssetdCountByVivo(sourceId int) (count int, err error) {
+func GetCygxOrderVirtualAssetdCountByVivo(sourceId, userId int) (count int, err error) {
 	o := orm.NewOrm()
-	sqlCount := ` SELECT COUNT(1) AS  count  FROM cygx_order_virtual_asset WHERE source IN ('activityvideo','activityvoice')   AND  source_id = ? `
-	err = o.Raw(sqlCount, sourceId).QueryRow(&count)
+	sqlCount := ` SELECT COUNT(1) AS  count  FROM cygx_order_virtual_asset WHERE source IN ('activityvideo','activityvoice')   AND  source_id = ?  AND  user_id = ?  `
+	err = o.Raw(sqlCount, sourceId, userId).QueryRow(&count)
 	return
 }
 

services/order.go

@@ -149,6 +149,8 @@ func GetActivityVivoPoints(item *models.ActivityDetail, wxUser *models.WxUserIte
 		return
 	}
 	if total == 0 {
+		//如果没有设置就直接播放
+		vivoPointsResp.HavePoint = true
 		return
 	}
 
@@ -158,7 +160,7 @@ func GetActivityVivoPoints(item *models.ActivityDetail, wxUser *models.WxUserIte
 		return
 	}
 
-	totalPayVivo, e := order.GetCygxOrderVirtualAssetdCountByVivo(activityId)
+	totalPayVivo, e := order.GetCygxOrderVirtualAssetdCountByVivo(activityId, wxUser.UserId)
 	if e != nil {
 		err = errors.New("GetCygxActivityPointsSetUserNum, Err: " + e.Error())
 		return

services/resource_data.go

@@ -253,6 +253,7 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 					list[i].ShareImg = videoShareMap[list[i].ChartPermissionId]
 				}
 			}
+			list[i].LabelKeywordImgLink = utils.LABEL_ICO_10
 		}
 		//Type                int    `description:"类型: 1-音频; 2-活动视频； 3-产业视频"`
 		for _, item := range list {