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

services/order.go

@@ -163,8 +163,14 @@ func GetActivityVivoPoints(item *models.ActivityDetail, wxUser *models.WxUserIte
 		err = errors.New("GetCygxActivityPointsSetUserNum, Err: " + e.Error())
 		return
 	}
-	//如果报了名，或者付费了，就直接观看
-	if totalMySuccess > 0 || totalPayVivo > 0 {
+
+	totalPointRecord, e := models.GetCygxActivityVivoPointRecordCount(activityId, wxUser.UserId)
+	if e != nil {
+		err = errors.New("GetCygxActivityVivoPointRecordCount, Err: " + e.Error())
+		return
+	}
+	//如果报了名，或者付费了，或者单独扣点了；就直接观看
+	if totalMySuccess > 0 || totalPayVivo > 0 || totalPointRecord > 0 {
 		vivoPointsResp.HavePoint = true
 	}