Merge branch 'cygx_4.4' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/activity.go

@@ -595,10 +595,11 @@ func (this *ActivityCoAntroller) Detail() {
 			if applyCount > 0 {
 				hasPermission = 4
 			} else {
-				hasPermission = 3
-			}
-			if sellerItem != nil {
-				hasPermission = 2
+				if sellerItem != nil {
+					hasPermission = 5
+				} else {
+					hasPermission = 3
+				}
 			}
 			resp.HasPermission = hasPermission
 			resp.OperationMode = "Apply"
@@ -679,9 +680,14 @@ func (this *ActivityCoAntroller) Detail() {
 		//冻结客户
 		if err != nil {
 			if err.Error() == utils.ErrNoRow() {
-				hasPermission = 4
-				if sellerItem != nil {
-					hasPermission = 2
+				if applyCount > 0 {
+					hasPermission = 4
+				} else {
+					if sellerItem != nil {
+						hasPermission = 5
+					} else {
+						hasPermission = 3
+					}
 				}
 				resp.HasPermission = hasPermission
 				resp.OperationMode = "Apply"
@@ -725,13 +731,14 @@ func (this *ActivityCoAntroller) Detail() {
 		if applyCount > 0 {
 			hasPermission = 4
 		} else {
-			hasPermission = 3
-		}
-		if sellerItem != nil {
-			hasPermission = 2
+			if sellerItem != nil {
+				hasPermission = 5
+			} else {
+				hasPermission = 3
+			}
 		}
 		resp.OperationMode = "Apply"
-		resp.PopupMsg = "您暂无权限参加 【" + activityInfo.ChartPermissionName + "】行业活动，若想参加可以申请开通哦"
+		resp.PopupMsg = "您暂无权限参加此活动，若想参加可以申请开通对应的试用权限"
 	}
 	if hasPermission == 1 {
 		//是否展示限免标签
@@ -839,10 +846,11 @@ func (this *ActivityCoAntroller) SignupAdd() {
 			if applyCount > 0 {
 				hasPermission = 4
 			} else {
-				hasPermission = 3
-			}
-			if sellerItem != nil {
-				hasPermission = 2
+				if sellerItem != nil {
+					hasPermission = 5
+				} else {
+					hasPermission = 3
+				}
 			}
 			resp.HasPermission = hasPermission
 			resp.OperationMode = "Apply"
@@ -887,12 +895,13 @@ func (this *ActivityCoAntroller) SignupAdd() {
 		if err != nil {
 			if err.Error() == utils.ErrNoRow() {
 				if applyCount > 0 {
-					hasPermission = 3
-				} else {
 					hasPermission = 4
-				}
-				if sellerItem != nil {
-					hasPermission = 2
+				} else {
+					if sellerItem != nil {
+						hasPermission = 5
+					} else {
+						hasPermission = 3
+					}
 				}
 				resp.HasPermission = hasPermission
 				resp.OperationMode = "Apply"
@@ -1127,10 +1136,11 @@ func (this *ActivityCoAntroller) SignupAdd() {
 		if applyCount > 0 {
 			hasPermission = 4
 		} else {
-			hasPermission = 3
-		}
-		if sellerItem != nil {
-			hasPermission = 2
+			if sellerItem != nil {
+				hasPermission = 5
+			} else {
+				hasPermission = 3
+			}
 		}
 		resp.OperationMode = "Apply"
 		resp.PopupMsg = "您暂无权限参加此活动，若想参加可以申请开通对应的试用权限"
@@ -1463,10 +1473,11 @@ func (this *ActivityCoAntroller) MeetingReminderAdd() {
 			if applyCount > 0 {
 				hasPermission = 4
 			} else {
-				hasPermission = 3
-			}
-			if sellerItem != nil {
-				hasPermission = 2
+				if sellerItem != nil {
+					hasPermission = 5
+				} else {
+					hasPermission = 3
+				}
 			}
 			resp.HasPermission = hasPermission
 			resp.OperationMode = "Apply"
@@ -1517,10 +1528,11 @@ func (this *ActivityCoAntroller) MeetingReminderAdd() {
 				if applyCount > 0 {
 					hasPermission = 4
 				} else {
-					hasPermission = 3
-				}
-				if sellerItem != nil {
-					hasPermission = 2
+					if sellerItem != nil {
+						hasPermission = 5
+					} else {
+						hasPermission = 3
+					}
 				}
 				resp.HasPermission = hasPermission
 				resp.OperationMode = "Apply"
@@ -1588,10 +1600,11 @@ func (this *ActivityCoAntroller) MeetingReminderAdd() {
 		if applyCount > 0 {
 			hasPermission = 4
 		} else {
-			hasPermission = 3
-		}
-		if sellerItem != nil {
-			hasPermission = 2
+			if sellerItem != nil {
+				hasPermission = 5
+			} else {
+				hasPermission = 3
+			}
 		}
 		resp.OperationMode = "Apply"
 		resp.PopupMsg = "您暂无权限参加此活动，若想参加可以申请开通对应的试用权限"
@@ -2787,6 +2800,13 @@ func (this *ActivityCoAntroller) CheckAsk() {
 		br.ErrMsg = "判断是否已申请过试用失败，Err:" + err.Error()
 		return
 	}
+	//获取销售信息
+	sellerItem, err := models.GetSellerByCompanyIdCheckFicc(user.CompanyId, 1)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		br.Msg = "申请失败"
+		br.ErrMsg = "获取销售信息失败,Err:" + err.Error()
+		return
+	}
 	resp := new(models.SignupStatus)
 	hasPermission := 0
 	var companyDetailStatus string
@@ -2803,11 +2823,15 @@ func (this *ActivityCoAntroller) CheckAsk() {
 			if applyCount > 0 {
 				hasPermission = 4
 			} else {
-				hasPermission = 3
+				if sellerItem != nil {
+					hasPermission = 5
+				} else {
+					hasPermission = 3
+				}
 			}
 			resp.HasPermission = hasPermission
 			resp.OperationMode = "Apply"
-			resp.PopupMsg = "您暂无权限参加 【" + activityInfo.ChartPermissionName + "】行业活动，若想参加可以申请开通哦"
+			resp.PopupMsg = "您暂无权限参加此活动，若想参加可以申请开通对应的试用权限"
 			br.Ret = 200
 			br.Success = true
 			br.Msg = "获取成功"
@@ -2845,9 +2869,18 @@ func (this *ActivityCoAntroller) CheckAsk() {
 		//冻结客户
 		if err != nil {
 			if err.Error() == utils.ErrNoRow() {
-				resp.HasPermission = 4
+				if applyCount > 0 {
+					hasPermission = 4
+				} else {
+					if sellerItem != nil {
+						hasPermission = 5
+					} else {
+						hasPermission = 3
+					}
+				}
+				resp.HasPermission = hasPermission
 				resp.OperationMode = "Apply"
-				resp.PopupMsg = "您暂无权限参加 【" + activityInfo.ChartPermissionName + "】行业活动，若想参加可以申请开通哦"
+				resp.PopupMsg = "您暂无权限参加此活动，若想参加可以申请开通对应的试用权限"
 				br.Ret = 200
 				br.Success = true
 				br.Msg = "获取成功"
@@ -2887,10 +2920,14 @@ func (this *ActivityCoAntroller) CheckAsk() {
 		if applyCount > 0 {
 			hasPermission = 4
 		} else {
-			hasPermission = 3
+			if sellerItem != nil {
+				hasPermission = 5
+			} else {
+				hasPermission = 3
+			}
 		}
 		resp.OperationMode = "Apply"
-		resp.PopupMsg = "您暂无权限参加 【" + activityInfo.ChartPermissionName + "】行业活动，若想参加可以申请开通哦"
+		resp.PopupMsg = "您暂无权限参加此活动，若想参加可以申请开通对应的试用权限"
 	}
 	resp.HasPermission = hasPermission
 	resp.SignupStatus = signupStatus

models/activity.go

@@ -101,7 +101,7 @@ type ActivityDetail struct {
 type CygxActivityResp struct {
 	HaqveJurisdiction bool   `description:"是否有权限"`
 	OperationMode     string `description:"操作方式 Apply:立即申请、Call:拨号 为空则为有权限"`
-	HasPermission     int    `description:"操作方式，1:有该行业权限,正常展示，2：无该行业权限，3：潜在客户，未提交过申请，4：潜在客户,已提交过申请"`
+	HasPermission     int    `description:"操作方式，1:有该行业权限,正常展示，2：无该行业权限，3：潜在客户，未提交过申请，4：潜在客户,已提交过申请，5：有IFCC、无权益"`
 	PopupMsg          string `description:"权限弹窗信息"`
 	MsgType           string `description:"Type ： 类型 , Industry ： 行业"`
 	SellerMobile      string `description:"销售电话"`