新增权限

controllers/report.go

@@ -74,7 +74,7 @@ func (this *ReportController) Detail() {
 		msg = "您还未开通权限，如有需要请联系对口销售"
 		report.Content = report.ContentSub
 	} else {
-		if company.CompanyType == 3 || company.CompanyType == 4 {
+		if company.Status == utils.COMPANY_STATUS_LOSE || company.Status == utils.COMPANY_STATUS_FREEZE {
 			status = 2
 			msg = "您还未开通权限，如有需要请联系对口销售"
 			report.Content = report.ContentSub
@@ -378,4 +378,4 @@ func (this *ReportController) AddAudioRecord() {
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "新增成功"
-}
+}

controllers/wechat.go

@@ -36,9 +36,9 @@ func (this *WechatCommonController) WechatLogin() {
 		br.ErrMsg = "获取用户信息失败，Err:" + err.Error()
 		return
 	}
-	if item.Errcode != "" {
+	if item.Errcode != 0 {
 		br.Msg = "获取用户信息失败"
-		br.ErrMsg = "获取access_token 失败 errcode:" + item.Errcode + " ;errmsg:" + item.Errmsg
+		br.ErrMsg = "获取access_token 失败 errcode:" + strconv.Itoa(item.Errcode) + " ;errmsg:" + item.Errmsg
 		return
 	}
 	openId := item.Openid

models/company.go

@@ -32,12 +32,14 @@ type Company struct {
 	FirstStartDate  string    `description:"首次设置为试用客户开始时间"`
 	FirstEndDate    string    `description:"首次设置为试用客户结束时间"`
 	DateType        int       `description:"设置流失类型，1：1个月，2：2个月，3：3个月"`
+	Status          string    `description:"'试用','永续','冻结','流失','正式','潜在'"`
 }
 
 func GetCompanyById(companyId int) (item *Company, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM company WHERE company_id=? `
+	sql := ` SELECT a.*,b.status FROM company AS a
+			INNER JOIN company_product AS b ON a.company_id=b.company_id
+			WHERE a.company_id=? AND b.product_id=1 `
 	err = o.Raw(sql, companyId).QueryRow(&item)
 	return
 }
-

models/wx_user.go

@@ -87,9 +87,10 @@ func GetPermissionSearchKeyWord(userId int) (items []*PermissionSearchKeyWord, e
 
 //判断客户权限总数
 func GetUserIsMaxPermission(companyId int) (count int, err error) {
-	sql := ` SELECT COUNT(DISTINCT b.chart_permission_id) as count FROM company as a
-        INNER JOIN company_report_permission as b on a.company_id=b.company_id
-        WHERE b.company_id=? `
+	sql := ` SELECT COUNT(DISTINCT b.chart_permission_id) AS COUNT FROM company AS a
+			INNER JOIN company_product AS c ON a.company_id=c.company_id AND c.product_id=1
+			INNER JOIN company_report_permission AS b ON a.company_id=b.company_id
+			WHERE b.company_id=? `
 	o := orm.NewOrm()
 	err = o.Raw(sql, companyId).QueryRow(&count)
 	return

services/user_permission.go

@@ -39,7 +39,9 @@ func CheckUserPermission(userId int) (status int, err error) {
 			err = errors.New("客户信息不存在：userId:" + strconv.Itoa(userId))
 			return status, err
 		}
-		if company.CompanyType == 1 || company.CompanyType == 2 {
+		if company.Status == utils.COMPANY_STATUS_FORMAL || //正式
+			company.Status == utils.COMPANY_STATUS_TRY_OUT || //试用
+			company.Status == utils.COMPANY_STATUS_FOREVER { //永续
 			status = 0
 		} else {
 			status = 40002

services/wechat.go

@@ -18,7 +18,7 @@ type WxAccessToken struct {
 	RefreshToken string `json:"refresh_token"`
 	Openid       string `json:"openid"`
 	Scope        string `json:"scope"`
-	Errcode      string `json:"errcode"`
+	Errcode      int `json:"errcode"`
 	Errmsg       string `json:"errmsg"`
 }
 
@@ -29,11 +29,11 @@ func WxGetUserOpenIdByCode(code string) (item *WxAccessToken, err error) {
 	}
 	requestUrl := `https://api.weixin.qq.com/sns/oauth2/access_token?appid=%s&secret=%s&code=%s&grant_type=authorization_code`
 	requestUrl = fmt.Sprintf(requestUrl, utils.WxAppId, utils.WxAppSecret, code)
-	fmt.Println("requestUrl:", requestUrl)
 	result, err := http.Get(requestUrl)
 	if err != nil {
 		return nil, err
 	}
+	utils.FileLog.Info("WxGetUserOpenIdByCode:%s",string(result))
 	err = json.Unmarshal(result, &item)
 	return
 }

utils/constants.go

@@ -70,3 +70,13 @@ var (
 	AccessKeyId     string = "LTAIFMZYQhS2BTvW"
 	AccessKeySecret string = "12kk1ptCHoGWedhBnKRVW5hRJzq9Fq"
 )
+
+
+//客户状态
+const (
+	COMPANY_STATUS_TRY_OUT       = "试用"
+	COMPANY_STATUS_FOREVER       = "永续"
+	COMPANY_STATUS_FREEZE        = "冻结"
+	COMPANY_STATUS_LOSE          = "流失"
+	COMPANY_STATUS_FORMAL        = "正式"
+)