Merge branch 'cygx_10.7' of http://8.136.199.33:3000/cxzhang/hongze_clpt into debug

controllers/activity.go

@@ -661,7 +661,6 @@ func (this *ActivityController) Detail() {
 		return
 	}
 	activityInfo.SignupNum = signupCount
-
 	havePower, isResearchSpecial, err := services.GetActivityDetailUserPower(user, activityInfo)
 	if err != nil {
 		br.Msg = "获取信息失败"
@@ -1083,6 +1082,10 @@ func (this *ActivityController) SignupAdd() {
 				go services.ActivityUserRemind(user, activityInfo, 4)
 				resp.PopupMsg = "<b>报名成功，已加入您的活动日程</b><br/><br/>想要及时获取活动信息变更通知，请关注【查研观向小助手】公众号"
 			}
+
+			if activityInfo.IsResearchPoints {
+				resp.PopupMsg = "<b>报名成功，已加入您的活动日程</b><br/><br/>想要及时获取活动信息变更通知，请关注【查研观向小助手】公众号"
+			}
 		}
 
 	} else {

services/activity.go

@@ -513,11 +513,14 @@ func HandleActivityTypeHomeList(listType []*models.ActivityTypeHome, listActivit
 		}
 		item.Resource = 1
 		item.ActivityId = v.ActivityId
-		if v.IsExternalLabel > 0 {
-			item.IsExternalLabel = true
-		}
-		if v.IsResearchPoints > 0 {
-			item.IsResearchPoints = true
+		//公司调研电话会的展示处理
+		if v.ActivityTypeId == 3 {
+			if v.IsExternalLabel > 0 {
+				item.IsExternalLabel = true
+			}
+			if v.IsResearchPoints > 0 {
+				item.IsResearchPoints = true
+			}
 		}
 		item.City = v.City
 		if utf8.RuneCountInString(v.City) != 2 {
@@ -662,6 +665,9 @@ func ActivityButtonShow(item *models.ActivityDetail, user *models.WxUserItem, pe
 					articleDetail.IsShowMeetingReminder = true
 					articleDetail.IsShowOutboundCall = true
 				}
+			} else {
+				articleDetail.IsExternalLabel = false
+				articleDetail.IsResearchPoints = false
 			}
 
 			//公司线下调研 4
@@ -968,7 +974,9 @@ func GetIndustryNewLabelMap(industryIds []int) (labelMap map[int]bool, err error
 func GetActivityDetailUserPower(user *models.WxUserItem, activityInfo *models.ActivityDetail) (havePower, isResearchSpecial bool, err error) {
 	var companyDetailStatus string
 	var userTypeStr string
-	if GetBelongingRai(user.Mobile) || activityInfo.ChartPermissionName == utils.HONG_GUAN_NAME {
+
+	//如果是弘则的用户或者宏观的权限不做校验
+	if (GetBelongingRai(user.Mobile) && user.CompanyId == utils.HZ_COMPANY_ID) || activityInfo.ChartPermissionName == utils.HONG_GUAN_NAME {
 		havePower = true
 		return
 	}
@@ -977,21 +985,7 @@ func GetActivityDetailUserPower(user *models.WxUserItem, activityInfo *models.Ac
 		err = errors.New("GetCompanyPermissionUpgrade, Err: " + e.Error())
 		return
 	}
-	//如果是 公司调研电话会：3，或 专家线下沙龙:5  而且  除易董同步过来的以外的研选类型活动，必须要有研选的正式权限
-	if (activityInfo.ActivityTypeId == 3 || activityInfo.ActivityTypeId == 5) && activityInfo.YidongActivityId == "" && strings.Contains(activityInfo.ChartPermissionName, utils.CHART_PERMISSION_NAME_YANXUAN) {
-		isResearchSpecial = true
-	}
-	//如果是 公司调研电话会：3，或 专家线下沙龙:5  而且  除易董同步过来的以外的研选类型活动，必须要有研选的正式权限
-	//if isResearchSpecial {
-	//	if !strings.Contains(permissionStr, utils.CHART_PERMISSION_NAME_YANXUAN) {
-	//		//如果连试用权限都没有，那么久按照普通的研选样式展示
-	//		isResearchSpecial = false
-	//	}
-	//	if !strings.Contains(permissionStrZhengShi, activityInfo.ChartPermissionName) {
-	//		havePower = false
-	//		return
-	//	}
-	//}
+
 	//处理决策人可见权限
 	if user.IsMaker == 0 && activityInfo.IsMakerShow == 1 {
 		havePower = false
@@ -1017,11 +1011,9 @@ func GetActivityDetailUserPower(user *models.WxUserItem, activityInfo *models.Ac
 			return
 		}
 	}
-
 	if permissionStr == "" {
 		return
 	}
-
 	//如果是易董的活动且属于研选类型，只要开通任何权限就可以查看详情
 	if activityInfo.YidongActivityId != "" && permissionStr != "" && strings.Contains(activityInfo.ChartPermissionName, utils.CHART_PERMISSION_NAME_YANXUAN) {
 		havePower = true
@@ -1042,10 +1034,9 @@ func GetActivityDetailUserPower(user *models.WxUserItem, activityInfo *models.Ac
 				havePower = false
 			}
 		}
-	}
-	//如果主客观校验不通过，那么直接返回
-	if !havePower {
-		return
+		if !havePower {
+			return
+		}
 	}
 	if activityInfo.LimitPeopleNum > 0 {
 		mapUserType, e := GetActivityCcustomerTypeList()
@@ -1110,11 +1101,14 @@ func GetActivityDetailUserPower(user *models.WxUserItem, activityInfo *models.Ac
 	} else if (activityInfo.ActivityTypeId == 1 || activityInfo.ActivityTypeId == 3 || activityInfo.ActivityTypeId == 4 || activityInfo.ActivityTypeId == 5) && strings.Contains(permissionStr, "专家") {
 		havePower = true
 	}
+
+	fmt.Println(permissionStrZhengShi)
 	//if (strings.Contains(activityInfo.ChartPermissionName, "研选") || activityInfo.ChartPermissionName == "策略") && strings.Contains(permissionStr, activityInfo.ChartPermissionName) {
 	//	havePower = true
 	//	return
 	//}
 	if strings.Contains(activityInfo.ChartPermissionName, "研选") || activityInfo.ChartPermissionName == "策略" {
+
 		if strings.Contains(activityInfo.CustomerTypeIds, "5") {
 			if strings.Contains(permissionStr, activityInfo.ChartPermissionName) {
 				havePower = true
@@ -1133,9 +1127,7 @@ func GetActivityDetailUserPower(user *models.WxUserItem, activityInfo *models.Ac
 		err = errs
 		return
 	}
-	//if strings.Contains(permissionShengji, activityInfo.ChartPermissionName) && strings.Contains(activityInfo.CustomerTypeIds, "8") {
-	//	havePower = true
-	//}
+
 	//fmt.Println("主客观2", havePower)
 	//if strings.Contains(permissionStr, activityInfo.ChartPermissionName) && strings.Contains(activityInfo.CustomerTypeIds, userTypeStr) {
 	//	havePower = true

services/activity_button.go

@@ -364,6 +364,9 @@ func ActivityButtonShowSearch(item *models.ActivityDetail, user *models.WxUserIt
 					articleDetail.IsShowMeetingReminder = true
 					articleDetail.IsShowOutboundCall = true
 				}
+			} else {
+				articleDetail.IsExternalLabel = false
+				articleDetail.IsResearchPoints = false
 			}
 
 			//公司线下调研 4