Merge branch 'cygx_10.5' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/activity.go

@@ -2122,6 +2122,8 @@ func (this *ActivityCoAntroller) CheckAsk() {
 		hasPermission = 1
 		signupStatus = "Success"
 		resp.HaqveJurisdiction = true
+		resp.HasPermission = hasPermission
+		resp.SignupStatus = signupStatus
 	} else {
 		hasPermission, sellerName, sellerMobile, popupMsg, err := services.GetUserHasPermissionActivity(user, activityInfo)
 		if err != nil {
@@ -2134,8 +2136,6 @@ func (this *ActivityCoAntroller) CheckAsk() {
 		resp.SellerName = sellerName
 		resp.SellerMobile = sellerMobile
 	}
-	resp.HasPermission = hasPermission
-	resp.SignupStatus = signupStatus
 	resp.ActivityId = activityId
 	br.Ret = 200
 	br.Success = true
@@ -3347,7 +3347,8 @@ func (this *ActivityCoAntroller) ActivityAppointmentAdd() {
 		resp.HaqveJurisdiction = true
 		//1：预约外呼 、2：设置会议提醒 、 3：预约纪要 、4：活动报名
 		go services.ActivityUserRemind(user, activityInfo, 3)
-
+		resp.HasPermission = hasPermission
+		resp.SignupStatus = signupStatus
 	} else {
 		hasPermission, sellerName, sellerMobile, popupMsg, err := services.GetUserHasPermissionActivity(user, activityInfo)
 		if err != nil {
@@ -3360,8 +3361,7 @@ func (this *ActivityCoAntroller) ActivityAppointmentAdd() {
 		resp.SellerName = sellerName
 		resp.SellerMobile = sellerMobile
 	}
-	resp.HasPermission = hasPermission
-	resp.SignupStatus = signupStatus
+
 	resp.ActivityId = activityId
 	var total int
 	total, err = models.GetUserCygxActivityAppointmentCountByUid(user.UserId)