Merge remote-tracking branch 'origin/user_permission'

controllers/report.go

@@ -174,8 +174,8 @@ func (this *ReportController) Detail() {
 		}
 	}
 
-	//如果客户产品被禁用了，那么没有权限
-	if company != nil && company.IsSuspend > 0 {
+	//如果客户产品被禁用了，只有在试用状态下，才不允许查看报告，那么没有权限
+	if company != nil && company.IsSuspend > 0 && company.Status == "试用" {
 		status = 2
 		msg = "您还未开通权限，如有需要请联系对口销售"
 	}

controllers/user.go

@@ -330,6 +330,11 @@ func (this *UserNotAuthController) Login() {
 	}
 	user, err = services.BindWxUser(openId, req.Mobile, req.Email, 1)
 	userId := user.UserId
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		br.Msg = "登录失败"
+		br.ErrMsg = "登录失败:" + err.Error()
+		return
+	}
 
 	var token string
 	tokenItem, err := models.GetTokenByOpenId(openId)

controllers/video.go

@@ -82,7 +82,7 @@ func (this *VideoController) List() {
 		status = 1
 	} else {
 		status = 1
-		for _,v:=range companyProduct{
+		for _, v := range companyProduct {
 			if v.Status == utils.COMPANY_STATUS_TRY_OUT ||
 				v.Status == utils.COMPANY_STATUS_FORMAL ||
 				v.Status == utils.COMPANY_STATUS_FOREVER {
@@ -90,6 +90,14 @@ func (this *VideoController) List() {
 				break
 			}
 		}
+
+		for _, v := range companyProduct {
+			//如果产品类型是 ficc ，且当前产品状态是禁用状态， 且是当前产品状态是禁用的，那么是没有权限访问的
+			if v.ProductId == 1 && v.IsSuspend > 0 && v.Status == utils.COMPANY_STATUS_TRY_OUT {
+				status = 1
+				break
+			}
+		}
 	}
 
 	pageSize, _ := this.GetInt("PageSize")
@@ -136,6 +144,7 @@ func (this *VideoController) List() {
 		} else {
 			list := make([]*models.VideoList, 0)
 			resp.List = list
+			resp.Status = status
 			br.Ret = 200
 			br.Success = true
 			br.Msg = "获取成功"

services/user.go

@@ -2,6 +2,7 @@ package services
 
 import (
 	"errors"
+	"fmt"
 	"hongze/hongze_api/models"
 	"hongze/hongze_api/utils"
 	"strconv"
@@ -220,7 +221,7 @@ func BindWxUser(openid, mobile, email string, registerPlatform int) (wxUser *mod
 	}
 	//如果存在该手机号/邮箱，那么需要校验
 	if userRecord.UserId > 0 && userRecord.UserId != userId {
-		err = errors.New("用户已绑定，不允许重复绑定")
+		err = errors.New(fmt.Sprint("用户已绑定其他账户,已绑定的用户编号：", userRecord.UserId, "，不允许重复绑定"))
 		return
 	}
 	if userRecord.UserId == 0 {