Merge branch 'mfyx_2.0' of http://8.136.199.33:3000/cxzhang/hongze_mfyx into debug

services/activity_signup.go

@@ -104,7 +104,9 @@ func CheckActivityPoints(activityInfo *models.ActivityDetail, wxUser *models.WxU
 			return
 		}
 
-		if companyPointsNum-userPointsNum < 0 {
+		activtyPayTotal := GetCygxOrderVirtualAssetdCountTotal(wxUser.Mobile, activityInfo.ActivityId) // 判断用户是否购买单场活动
+
+		if companyPointsNum-userPointsNum < 0 && activtyPayTotal == 0 {
 			checkPoints = false
 			var popupPriceMsg string
 			if utils.IS_SHOW_WX_PAY {