no message

controllers/activity_special.go

@@ -249,34 +249,6 @@ func (this *ActivitySpecialController) SpecialTripAdd() {
 				return
 			}
 			go services.SpecialActivityPointsBillSignupAddSpecial(activityId, uid) // 用户报名专项调研活动扣点处理
-			//流水记录表
-			//itemBill := new(models.CygxActivitySpecialTripBill)
-			//itemBill.UserId = user.UserId
-			//itemBill.ActivityId = activityInfo.ActivityId
-			//itemBill.CreateTime = time.Now()
-			//itemBill.Mobile = user.Mobile
-			//itemBill.Email = user.Email
-			//itemBill.CompanyId = user.CompanyId
-			//itemBill.CompanyName = user.CompanyName
-			//itemBill.RealName = user.RealName
-			//itemBill.Source = 1
-			//itemBill.DoType = 1
-			//itemBill.BillDetailed = -1 // 流水减一
-			//itemBill.RegisterPlatform = utils.REGISTER_PLATFORM
-			//itemBill.ChartPermissionId = activityInfo.ChartPermissionId
-			//itemBill.ChartPermissionName = activityInfo.ChartPermissionName
-			//
-			//if utils.InArrayByStr(utils.ACTIVITY_SPECIAL_TRIP_PERMISSION_NAME_OTHER, activityInfo.ChartPermissionName) {
-			//	//如果是策略、固收、周期行业，把代扣行业信息放入流水表，取消报名的时候，返点使用
-			//	maxChartPermissionId, maxChartPermissionName, err := services.GetSpecialBillMaxChartPermissionId(user)
-			//	if err != nil {
-			//		br.Msg = "操作失败"
-			//		br.ErrMsg = "获取销售信息失败,GetSpecialBillMaxChartPermissionId Err:" + err.Error()
-			//		return
-			//	}
-			//	itemBill.ChartPermissionId = maxChartPermissionId
-			//	itemBill.ChartPermissionName = maxChartPermissionName
-			//}
 
 			var itemMeeting = new(models.CygxActivitySpecialMeetingDetail)
 			itemMeeting.UserId = user.UserId
@@ -355,53 +327,9 @@ func (this *ActivitySpecialController) SpecialTripAdd() {
 					br.ErrMsg = "二次报名，更改报名是否有效状态失败，Err:" + err.Error()
 					return
 				}
-				//resultTime := utils.StrTimeToTime(activityInfo.ActivityTime)
-				//48小时之内的取消也扣除一次参会记录
-				//if time.Now().Add(+time.Hour * 48).After(resultTime) {
-				//	itemBill.BillDetailed = 0 //48小时之内，取消报名之后二次报名，不扣除流水记录
-				//} else {
-				//	err = services.DeductTripRemainingtimesByUser(user, activityInfo) //扣除用户专项调研剩余次数
-				//	if err != nil {
-				//		br.Msg = "操作失败"
-				//		br.ErrMsg = "操作失败,Err:" + err.Error()
-				//		return
-				//	}
-				//}
+
 			}
-			//userType, tripRemaining, mapChartName, err := services.GetChartPermissionSpecialSurplusByCompany(user.CompanyId)
-			//if err != nil {
-			//	br.Msg = "获取专项调研剩余次数失败"
-			//	br.ErrMsg = "获取专项调研剩余次数失败,err:" + err.Error()
-			//	return
-			//}
-			//if userType == 2 {
-			//	tripRemaining = tripRemaining + itemBill.BillDetailed
-			//	itemBill.Total = strconv.Itoa(tripRemaining) + "次"
-			//} else {
-			//	for k, num := range mapChartName {
-			//		if activityInfo.ChartPermissionName == k {
-			//			num = num + itemBill.BillDetailed
-			//		}
-			//		itemBill.Total += k + strconv.Itoa(num) + "次+"
-			//	}
-			//	itemBill.Total = strings.TrimRight(itemBill.Total, "+")
-			//}
 
-			//totalText, err := services.HandleActivitySpecialTripBillTotalText(user.CompanyId)
-			//if err != nil {
-			//	br.Msg = "报名失败，"
-			//	br.ErrMsg = "二次报名，更改报名是否有效状态失败，Err:" + err.Error()
-			//	return
-			//}
-			//itemBill.Total = totalText
-			//
-			////添加流水记录
-			//err = models.AddCygxActivitySpecialTripBill(itemBill)
-			//if err != nil {
-			//	br.Msg = "报名失败，"
-			//	br.ErrMsg = "AddCygxActivitySpecialTripBill，Err:" + err.Error()
-			//	return
-			//}
 			//添加数据到会信息
 			err = models.AddCygxActivitySpecialMeetingDetail(itemMeeting)
 			if err != nil {

services/activity_special_trip.go

@@ -163,44 +163,55 @@ func GetTripRemainingtimesBycompany(user *models.WxUserItem, activityInfo *model
 // 校验是否还有剩余次数
 func CheckTripRemainingtimesBycompany(user *models.WxUserItem, activityInfo *models.CygxActivitySpecialDetail) (errMsg string, err error) {
 	msgTemplate := "您的专项调研次数已用完，如仍想参加，请与您的对口销售商议"
-	companyId := user.CompanyId
-	chartPermissionName := activityInfo.ChartPermissionName
-
-	companyDetail, e := models.GetCompanyDetailByIdGroup(companyId)
+	//companyId := user.CompanyId
+	//chartPermissionName := activityInfo.ChartPermissionName
+	//
+	//companyDetail, e := models.GetCompanyDetailByIdGroup(companyId)
+	//if e != nil {
+	//	err = errors.New("GetCompanyDetailByIdGroup, Err:" + e.Error())
+	//	return
+	//}
+	////永续客户不限制次数
+	//if companyDetail.Status == utils.COMPANY_STATUS_FOREVER {
+	//	return
+	//}
+	//var condition string
+	//var pars []interface{}
+	//condition = " AND  company_id  = ?  AND points  > 0   ORDER BY  chart_permission_id DESC  "
+	//pars = append(pars, companyId)
+	//activitySpecialPermissionPointsList, e := models.GetCygxActivitySpecialPermissionPointsList(condition, pars)
+	//if e != nil && e.Error() != utils.ErrNoRow() {
+	//	err = errors.New("GetCygxActivitySpecialPermissionPointsList, Err:" + e.Error())
+	//	return
+	//}
+	////如果没有剩余的点数，就返回
+	//if len(activitySpecialPermissionPointsList) == 0 {
+	//	errMsg = msgTemplate
+	//	return
+	//}
+	//
+	////判断是不是策略、固收、周期行业的活动，如果不是策略就获取对应行业的点数 ，策略的任何一个行业有剩余点数都能参加
+	////if chartPermissionName != utils.CE_LUE_NAME && chartPermissionName != utils.GU_SHOU_NAME && chartPermissionName != utils.ZHOU_QI_NAME {
+	//if !utils.InArrayByStr(utils.ACTIVITY_SPECIAL_TRIP_PERMISSION_NAME_OTHER, activityInfo.ChartPermissionName) {
+	//	return
+	//} else {
+	//	for _, v := range activitySpecialPermissionPointsList {
+	//		if v.ChartPermissionName == chartPermissionName || v.ChartPermissionId == 0 {
+	//			return
+	//		} // 如果对应行业有剩余次数，或者是属于大套餐且有次数，那么校验也通过
+	//	}
+	//}
+	// 获取用户所在公司剩余的点
+	companyPointsNum, e := models.GetCygxActivitySpecialPermissionPoints(user.CompanyId)
 	if e != nil {
-		err = errors.New("GetCompanyDetailByIdGroup, Err:" + e.Error())
-		return
-	}
-	//永续客户不限制次数
-	if companyDetail.Status == utils.COMPANY_STATUS_FOREVER {
-		return
-	}
-	var condition string
-	var pars []interface{}
-	condition = " AND  company_id  = ?  AND points  > 0   ORDER BY  chart_permission_id DESC  "
-	pars = append(pars, companyId)
-	activitySpecialPermissionPointsList, e := models.GetCygxActivitySpecialPermissionPointsList(condition, pars)
-	if e != nil && e.Error() != utils.ErrNoRow() {
-		err = errors.New("GetCygxActivitySpecialPermissionPointsList, Err:" + e.Error())
+		err = errors.New("GetCompanyPoints, Err: " + e.Error())
 		return
 	}
 	//如果没有剩余的点数，就返回
-	if len(activitySpecialPermissionPointsList) == 0 {
+	if companyPointsNum < 1 {
 		errMsg = msgTemplate
 		return
 	}
-
-	//判断是不是策略、固收、周期行业的活动，如果不是策略就获取对应行业的点数 ，策略的任何一个行业有剩余点数都能参加
-	//if chartPermissionName != utils.CE_LUE_NAME && chartPermissionName != utils.GU_SHOU_NAME && chartPermissionName != utils.ZHOU_QI_NAME {
-	if !utils.InArrayByStr(utils.ACTIVITY_SPECIAL_TRIP_PERMISSION_NAME_OTHER, activityInfo.ChartPermissionName) {
-		return
-	} else {
-		for _, v := range activitySpecialPermissionPointsList {
-			if v.ChartPermissionName == chartPermissionName || v.ChartPermissionId == 0 {
-				return
-			} // 如果对应行业有剩余次数，或者是属于大套餐且有次数，那么校验也通过
-		}
-	}
 	return
 
 }