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

services/order.go

@@ -195,7 +195,12 @@ func GetActivityVivoPoints(item *models.ActivityDetail, wxUser *models.WxUserIte
 	}
 	vivoPointsResp.CompanyPoints = fmt.Sprint(companyPointsNum)
 
-	if havePower {
+	havePowerYx, e := GetArticleDetailUserPower(wxUser)
+	if e != nil {
+		err = errors.New("GetArticleDetailUserPower, Err: " + e.Error())
+		return
+	}
+	if havePower || havePowerYx {
 		if vivoPointsSetDetail.PointsNum == 0 { //有权限情况下，点数为零的时候直接播放
 			vivoPointsResp.HavePoint = true
 		}