Merge branch 'cygx_8.2' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/activity_special.go

@@ -132,7 +132,7 @@ func (this *ActivitySpecialCoAntroller) SpecialDetail() {
 		var condition string
 		var pars []interface{}
 
-		condition += ` AND activity_id =  ? `
+		condition += ` AND t.activity_id =  ? AND t.is_cancel = 0 `
 		pars = append(pars, activityInfo.ActivityId)
 
 		tripTota, err := models.GetActivitySpecialTripCountByActivityId(condition, pars)

models/activity_special_trip.go

@@ -60,7 +60,7 @@ func GetUserActivitySpecialTripCount(uid, activityId int) (count int, err error)
 
 //获取某一活动的报名的数量
 func GetActivitySpecialTripCountByActivityId(condition string, pars []interface{}) (count int, err error) {
-	sqlCount := `SELECT COUNT(1) AS count FROM cygx_activity_special_trip  WHERE    1 = 1 ` + condition
+	sqlCount := `SELECT COUNT(1) AS count FROM cygx_activity_special_trip as t   INNER JOIN wx_user as  u on u.user_id = t.user_id WHERE    1 = 1 ` + condition
 	o := orm.NewOrm()
 	err = o.Raw(sqlCount, pars).QueryRow(&count)
 	return

utils/constants.go

@@ -147,7 +147,7 @@ const (
 
 //模板消息地址路由
 const (
-	ACtIVITY_SPECIAL_EXPLAIN      = "此类调研具体行程尚未确认，待预报名人数满10人后弘则会确定行程并推送给您活动日期，只有在确认行程中再次报名才完成占位。"                        //专项调研说明
+	ACtIVITY_SPECIAL_EXPLAIN      = "此类调研具体行程尚未确定，待预报名人数满10人后弘则会确定行程并推送给您活动日期，只有在确定行程中再次报名才完成占位。"                        //专项调研说明
 	ACtIVITY_SPECIAL_TRIP_EXPLAIN = "此类调研时间安排已经确定，点击报名后按人次扣除对应机构的服务点数。由于每场活动人数有限，如果不能参加请提前48小时取消，未及时取消导致影响其他客户报名将会维持扣点。" //专项调研说明
 
 )