no message

controllers/yanxuan_special.go

@@ -246,12 +246,28 @@ func (this *BaseAuthMobileController) Detail() {
 		hasPermission = 1
 		resp.Content = utils.InterceptHtmlLength(resp.Content, 240) // 截取前80个字
 	} else {
-		hasPermission, _, _, _, err = services.GetUserHasPermissionArticle(user)
-		if err != nil {
+		//查询研选的权限状态
+		var condition string
+		var pars []interface{}
+		condition = " AND company_id = ?  AND status  IN ('正式','试用')  AND chart_permission_id = ?   ORDER BY company_report_permission_id DESC LIMIT 1  "
+		pars = append(pars, user.CompanyId, utils.CHART_PERMISSION_ID_YANXUAN)
+		companyReportPermissionDetail, err := models.GetCompanyReportPermissionDetailByCondition(condition, pars)
+		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "获取信息失败"
-			br.ErrMsg = "判断是否已申请过试用失败，Err:" + err.Error()
+			br.ErrMsg = "获取用户所在公司剩余的点失败,Err:" + err.Error()
 			return
 		}
+		if companyReportPermissionDetail == nil {
+			hasPermission, _, _, _, err = services.GetUserHasPermissionArticle(user)
+			if err != nil {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "判断是否已申请过试用失败，Err:" + err.Error()
+				return
+			}
+		} else {
+			hasPermission = 1
+		}
+
 	}
 
 	resp.HasPermission = hasPermission

services/company_permission.go

@@ -143,9 +143,9 @@ func GetUserHasPermissionActivity(user *models.WxUserItem, activityInfo *models.
 
 	if strings.Contains(activityInfo.ChartPermissionName, utils.CHART_PERMISSION_NAME_YANXUAN) {
 		if activityPointsByUserAllMap[activityInfo.ActivityId] {
-			popupMsg = "签约买方研选套餐才可参与此活动，请联系对口销售"
+			popupMsg = "签约研选套餐才可参与此活动，请联系对口销售"
 		} else {
-			popupMsg = "暂无<b>买方研选</b>权限<br/>您可申请开通试用"
+			popupMsg = "暂无<b>研选</b>权限<br/>您可申请开通试用"
 		}
 	} else {
 		popupMsg = "您暂无权限参加此活动，若想参加可以申请开通对应的试用权限"
@@ -178,7 +178,7 @@ func GetUserHasPermissionActivity(user *models.WxUserItem, activityInfo *models.
 			}
 			hasPermission = hasPermission
 			if strings.Contains(activityInfo.ChartPermissionName, utils.CHART_PERMISSION_NAME_YANXUAN) {
-				popupMsg = "暂无<b>买方研选</b>权限<br/>您可申请开通试用"
+				popupMsg = "暂无<b>研选</b>权限<br/>您可申请开通试用"
 			} else {
 				popupMsg = "您暂无权限参加此活动，若想参加可以申请开通对应的试用权限"
 			}
@@ -200,9 +200,9 @@ 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) && (activityInfo.ActivityTypeId == 3 || activityInfo.ActivityTypeId == 5) {
-				popupMsg = "暂无<b>买方研选</b>权限<br/>点击提交申请，提醒对口销售为你开通试用"
+				popupMsg = "暂无<b>研选</b>权限<br/>点击提交申请，提醒对口销售为你开通试用"
 			} else {
-				popupMsg = "签约买方研选套餐才可参与此活动，请联系对口销售"
+				popupMsg = "签约研选套餐才可参与此活动，请联系对口销售"
 			}
 		} else {
 			if companyPermission == "专家" {