xingzai 1 рік тому
батько
коміт
8796585353

+ 13 - 3
controllers/activity_special.go

@@ -266,14 +266,14 @@ func (this *ActivitySpecialController) SpecialTripAdd() {
 
 			if activityInfo.ChartPermissionName == utils.CE_LUE_NAME {
 				//如果是策略行业,把代扣行业信息放入流水表,取消报名的时候,返点使用
-				maxChartPermissionId, maxChartPermissionName, err := services.GetSpecialBillMaxChartPermissionId(user)
+				lastTripBill, err := models.GetCygxActivitySpecialTripBillLastDetialByActivityId(activityInfo.ActivityId, user.UserId)
 				if err != nil {
 					br.Msg = "操作失败"
 					br.ErrMsg = "获取销售信息失败,GetSpecialBillMaxChartPermissionId Err:" + err.Error()
 					return
 				}
-				itemBill.ChartPermissionId = maxChartPermissionId
-				itemBill.ChartPermissionName = maxChartPermissionName
+				itemBill.ChartPermissionId = lastTripBill.ChartPermissionId
+				itemBill.ChartPermissionName = lastTripBill.ChartPermissionName
 			}
 
 			var itemMeeting = new(models.CygxActivitySpecialMeetingDetail)
@@ -453,6 +453,16 @@ func (this *ActivitySpecialController) Tripcancel() {
 		return
 	}
 	activityId := req.ActivityId
+	total, err := models.GetUserActivitySpecialTripCount(user.UserId, activityId)
+	if err != nil {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "获取日程数量信息失败,Err:" + err.Error()
+		return
+	}
+	if total == 0 {
+		br.Msg = "报名已取消!"
+		return
+	}
 	activityInfo, errInfo := models.GetCygxActivitySpecialDetailById(uid, activityId)
 	if activityInfo == nil {
 		br.Msg = "操作失败"

+ 8 - 0
models/activity_special_trip.go

@@ -59,6 +59,14 @@ func GetUserActivitySpecialTripCount(uid, activityId int) (count int, err error)
 	return
 }
 
+// 获取某一用户有效报名数量
+func GetUserActivitySpecialTripIsValidCount(uid, activityId int) (count int, err error) {
+	sqlCount := `SELECT COUNT(1) AS count FROM cygx_activity_special_trip  WHERE  user_id=?  AND   activity_id =?  AND  is_valid = 1 `
+	o := orm.NewOrm()
+	err = o.Raw(sqlCount, uid, activityId).QueryRow(&count)
+	return
+}
+
 // 获取某一活动的报名的数量
 func GetActivitySpecialTripCountByActivityId(condition string, pars []interface{}) (count int, err error) {
 	sqlCount := `SELECT COUNT(1) AS count FROM cygx_activity_special_trip as t    WHERE    1 = 1 ` + condition

+ 2 - 2
services/activity_special_trip.go

@@ -280,7 +280,7 @@ func RebateTripRemainingtimesByUser(user *models.WxUserItem, activityInfo *model
 		condition = " AND  company_id  = ?  AND  chart_permission_id  = ?   LIMIT 1   "
 		pars = append(pars, companyId, activityInfo.ChartPermissionId)
 	} else {
-		listLastTripBill, e := models.GetCygxActivitySpecialTripBillLastDetialByActivityId(activityInfo.ActivityId, user.UserId)
+		lastTripBill, e := models.GetCygxActivitySpecialTripBillLastDetialByActivityId(activityInfo.ActivityId, user.UserId)
 		if e != nil {
 			err = errors.New("GetActivitySpecialTripCountByActivitySpecial, Err: " + e.Error())
 			return
@@ -288,7 +288,7 @@ func RebateTripRemainingtimesByUser(user *models.WxUserItem, activityInfo *model
 
 		pars = make([]interface{}, 0)
 		condition = " AND  company_id  = ?  AND  chart_permission_id  = ?    LIMIT 1   "
-		pars = append(pars, companyId, listLastTripBill.ChartPermissionId)
+		pars = append(pars, companyId, lastTripBill.ChartPermissionId)
 	}
 	activitySpecialPermissionPointsList, e := models.GetCygxActivitySpecialPermissionPointsList(condition, pars)
 	if e != nil && e.Error() != utils.ErrNoRow() {