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

controllers/activity.go

@@ -574,6 +574,19 @@ func (this *ActivityCoAntroller) Detail() {
 		br.ErrMsg = "判断是否已申请过试用失败，Err:" + err.Error()
 		return
 	}
+	//如果是FICC的客户类型，则默认他申请过
+	if applyCount == 0 {
+		//获取销售信息
+		sellerItem, err := models.GetSellerByCompanyIdCheckFicc(user.CompanyId, 1)
+		if err != nil && err.Error() != utils.ErrNoRow() {
+			br.Msg = "申请失败"
+			br.ErrMsg = "获取销售信息失败,Err:" + err.Error()
+			return
+		}
+		if sellerItem != nil {
+			applyCount = 1
+		}
+	}
 	if user.CompanyId <= 1 {
 		companyDetailStatus = ""
 	} else {
@@ -785,6 +798,19 @@ func (this *ActivityCoAntroller) SignupAdd() {
 		br.ErrMsg = "判断是否已申请过试用失败，Err:" + err.Error()
 		return
 	}
+	//如果是FICC的客户类型，则默认他申请过
+	if applyCount == 0 {
+		//获取销售信息
+		sellerItem, err := models.GetSellerByCompanyIdCheckFicc(user.CompanyId, 1)
+		if err != nil && err.Error() != utils.ErrNoRow() {
+			br.Msg = "申请失败"
+			br.ErrMsg = "获取销售信息失败,Err:" + err.Error()
+			return
+		}
+		if sellerItem != nil {
+			applyCount = 1
+		}
+	}
 	activityInfo, errInfo := models.GetAddActivityInfoById(activityId)
 	if activityInfo == nil {
 		br.Msg = "操作失败"
@@ -856,7 +882,18 @@ func (this *ActivityCoAntroller) SignupAdd() {
 		//冻结客户
 		if err != nil {
 			if err.Error() == utils.ErrNoRow() {
-				resp.HasPermission = 4
+				//获取销售信息
+				sellerItem, err := models.GetSellerByCompanyIdCheckFicc(user.CompanyId, 1)
+				if err != nil && err.Error() != utils.ErrNoRow() {
+					br.Msg = "申请失败"
+					br.ErrMsg = "获取销售信息失败,Err:" + err.Error()
+					return
+				}
+				if sellerItem != nil {
+					resp.HasPermission = 3
+				} else {
+					resp.HasPermission = 4
+				}
 				resp.OperationMode = "Apply"
 				resp.PopupMsg = "您暂无权限参加此活动，若想参加可以申请开通对应的试用权限"
 				br.Ret = 200
@@ -1395,6 +1432,19 @@ func (this *ActivityCoAntroller) MeetingReminderAdd() {
 		br.ErrMsg = "判断是否已申请过试用失败，Err:" + err.Error()
 		return
 	}
+	//如果是FICC的客户类型，则默认他申请过
+	if applyCount == 0 {
+		//获取销售信息
+		sellerItem, err := models.GetSellerByCompanyIdCheckFicc(user.CompanyId, 1)
+		if err != nil && err.Error() != utils.ErrNoRow() {
+			br.Msg = "申请失败"
+			br.ErrMsg = "获取销售信息失败,Err:" + err.Error()
+			return
+		}
+		if sellerItem != nil {
+			applyCount = 1
+		}
+	}
 	//SignupStatus string `description:"报名状态：人数已满：FullStarffed、单机构超过两人：TwoPeople、爽约次数过多：BreakPromise、超时：Overtime 、成功：Success"`
 	item := new(models.CygxActivityMeetingReminder)
 	resp := new(models.SignupStatus)
@@ -1460,7 +1510,19 @@ func (this *ActivityCoAntroller) MeetingReminderAdd() {
 		//冻结客户
 		if err != nil {
 			if err.Error() == utils.ErrNoRow() {
-				resp.HasPermission = 4
+				//如果是FICC的客户类型，则默认他申请过
+				//获取销售信息
+				sellerItem, err := models.GetSellerByCompanyIdCheckFicc(user.CompanyId, 1)
+				if err != nil && err.Error() != utils.ErrNoRow() {
+					br.Msg = "申请失败"
+					br.ErrMsg = "获取销售信息失败,Err:" + err.Error()
+					return
+				}
+				if sellerItem != nil {
+					resp.HasPermission = 3
+				} else {
+					resp.HasPermission = 4
+				}
 				resp.OperationMode = "Apply"
 				resp.PopupMsg = "您暂无权限参加此活动，若想参加可以申请开通对应的试用权限"
 				br.Ret = 200