|
@@ -192,10 +192,18 @@ func GetActivityVivoPoints(item *models.ActivityDetail, wxUser *models.WxUserIte
|
|
|
vivoPointsResp.CompanyPoints = fmt.Sprint(companyPointsNum)
|
|
|
|
|
|
if havePower {
|
|
|
- if companyPointsNum >= vivoPointsSetDetail.PointsNum {
|
|
|
- vivoPointsResp.PointPermission = 1
|
|
|
+ if vivoPointsSetDetail.PointsNum == 0 { //有权限情况下,点数为零的时候直接播放
|
|
|
+ vivoPointsResp.HavePoint = true
|
|
|
+ }
|
|
|
+ if companyPointsNum > 0 {
|
|
|
+ if companyPointsNum >= vivoPointsSetDetail.PointsNum {
|
|
|
+ vivoPointsResp.PointPermission = 1
|
|
|
+ } else {
|
|
|
+ vivoPointsResp.PointPermission = 2
|
|
|
+ }
|
|
|
} else {
|
|
|
- vivoPointsResp.PointPermission = 2
|
|
|
+ //客户剩余点数为0的情况下,直接支付
|
|
|
+ vivoPointsResp.PointPermission = 3
|
|
|
}
|
|
|
} else {
|
|
|
if vivoPointsSetDetail.GoodsMoney > 0 {
|
|
@@ -203,27 +211,6 @@ func GetActivityVivoPoints(item *models.ActivityDetail, wxUser *models.WxUserIte
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- //if vivoPointsSetDetail.Source == utils.CYGX_OBJ_ACTIVITYVIDEO { //活动视频
|
|
|
- // activityVideoInfo, e := models.GetCygxActivityVideoByActivityId(activityId)
|
|
|
- // if e != nil {
|
|
|
- // err = errors.New("GetCygxActivityVideoByActivityId, Err: " + e.Error())
|
|
|
- // return
|
|
|
- // }
|
|
|
- // vivoPointsResp.Type = 2
|
|
|
- // vivoPointsResp.Title = activityVideoInfo.VideoName
|
|
|
- // vivoPointsResp.ResourceUrl = activityVideoInfo.VideoUrl
|
|
|
- // vivoPointsResp.PlaySeconds = activityVideoInfo.VideoDuration
|
|
|
- //} else if vivoPointsSetDetail.Source == utils.CYGX_OBJ_ACTIVITYVOICE { //活动音频
|
|
|
- // activityVoiceInfo, e := models.GetCygxActivityVoiceByActivityId(activityId)
|
|
|
- // if e != nil {
|
|
|
- // err = errors.New("GetCygxActivityVoiceByActivityId, Err: " + e.Error())
|
|
|
- // return
|
|
|
- // }
|
|
|
- // vivoPointsResp.Type = 1
|
|
|
- // vivoPointsResp.Title = activityVoiceInfo.VoiceName
|
|
|
- // vivoPointsResp.ResourceUrl = activityVoiceInfo.VoiceUrl
|
|
|
- // vivoPointsResp.PlaySeconds = activityVoiceInfo.VoicePlaySeconds
|
|
|
- //}
|
|
|
return
|
|
|
}
|
|
|
|