no message

services/company_permission.go

@@ -150,18 +150,8 @@ func GetUserHasPermissionActivity(user *models.WxUserItem, activityInfo *models.
 		return
 	}
 
-	companyPermission, e := models.GetCompanyPermission(user.CompanyId)
-	if e != nil {
-		err = errors.New("GetCompanyPermission, Err: " + e.Error())
-		return
-	}
-
 	if strings.Contains(activityInfo.ChartPermissionName, utils.CHART_PERMISSION_NAME_YANXUAN) {
-		if !strings.Contains(companyPermission, utils.CHART_PERMISSION_NAME_YANXUAN) {
-			popupMsg = "暂无<b>买方研选</b>权限<br/>您可申请开通试用"
-		} else {
-			popupMsg = "签约买方研选套餐才可参与此活动，请联系对口销售"
-		}
+		popupMsg = "暂无<b>买方研选</b>权限<br/>您可申请开通试用"
 	} else {
 		popupMsg = "您暂无权限参加此活动，若想参加可以申请开通对应的试用权限"
 	}
@@ -193,11 +183,7 @@ func GetUserHasPermissionActivity(user *models.WxUserItem, activityInfo *models.
 			}
 			hasPermission = hasPermission
 			if strings.Contains(activityInfo.ChartPermissionName, utils.CHART_PERMISSION_NAME_YANXUAN) {
-				if !strings.Contains(companyPermission, utils.CHART_PERMISSION_NAME_YANXUAN) {
-					popupMsg = "暂无<b>买方研选</b>权限<br/>您可申请开通试用"
-				} else {
-					popupMsg = "签约买方研选套餐才可参与此活动，请联系对口销售"
-				}
+				popupMsg = "暂无<b>买方研选</b>权限<br/>您可申请开通试用"
 			} else {
 				popupMsg = "您暂无权限参加此活动，若想参加可以申请开通对应的试用权限"
 			}
@@ -218,12 +204,11 @@ func GetUserHasPermissionActivity(user *models.WxUserItem, activityInfo *models.
 		}
 		if strings.Contains(activityInfo.ChartPermissionName, utils.CHART_PERMISSION_NAME_YANXUAN) {
 			//popupMsg = "暂无<b>买方研选</b>权限<br/>点击提交申请，提醒对口销售为你开通试用"
-			if !strings.Contains(companyPermission, utils.CHART_PERMISSION_NAME_YANXUAN) {
+			if !strings.Contains(companyPermission, utils.CHART_PERMISSION_NAME_YANXUAN) && (activityInfo.ActivityTypeId == 3 || activityInfo.ActivityTypeId == 5) {
 				popupMsg = "暂无<b>买方研选</b>权限<br/>点击提交申请，提醒对口销售为你开通试用"
 			} else {
 				popupMsg = "签约买方研选套餐才可参与此活动，请联系对口销售"
 			}
-			popupMsg = "签约买方研选套餐才可参与此活动，请联系对口销售"
 		} else {
 			if companyPermission == "专家" {
 				popupMsg = "您暂无权限参加【" + activityInfo.ActivityTypeName + "】类型活动，若想参加请联系对口销售--" + companyItem.SellerName + "：" + companyItem.Mobile