Browse Source

Ficcd策略权限查看

xingzai 3 years ago
parent
commit
1d3ee7ec4d
3 changed files with 29 additions and 11 deletions
  1. 1 1
      controllers/user.go
  2. 10 0
      models/seller.go
  3. 18 10
      models/wechat.go

+ 1 - 1
controllers/user.go

@@ -902,7 +902,7 @@ func (this *UserController) ApplyTryOut() {
 	}
 
 	//获取销售信息
-	sellerItem, err := models.GetSellerByCompanyId(user.CompanyId)
+	sellerItem, err := models.GetSellerByCompanyIdCheckFicc(user.CompanyId)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "申请失败"
 		br.ErrMsg = "获取销售信息失败,Err:" + err.Error()

+ 10 - 0
models/seller.go

@@ -21,6 +21,16 @@ type AdminItem struct {
 }
 
 func GetSellerByCompanyId(companyId int) (item *AdminItem, err error) {
+	o := orm.NewOrm()
+	sql := ` SELECT b.*,c.open_id,c.user_id,a.company_name FROM company_product AS a
+			INNER JOIN admin AS b ON a.seller_id=b.admin_id
+			LEFT JOIN wx_user AS c ON b.mobile=c.mobile
+			WHERE a.company_id=? `
+	err = o.Raw(sql, companyId).QueryRow(&item)
+	return
+}
+
+func GetSellerByCompanyIdCheckFicc(companyId int) (item *AdminItem, err error) {
 	o := orm.NewOrm()
 	sql := ` SELECT b.*,c.open_id,c.user_id,a.company_name FROM company_product AS a
 			INNER JOIN admin AS b ON a.seller_id=b.admin_id

+ 18 - 10
models/wechat.go

@@ -82,19 +82,27 @@ func GetWxToken() (item *WxAccessToken, err error) {
 }
 
 func GetWxAccessTokenByXzs() (accessTokenStr string, err error) {
-	//缓存校验
-	cacheKey := "xygxxzs_wxtoken"
-	accessTokenStr, _ = utils.Rc.RedisString(cacheKey)
-	if accessTokenStr != "" {
-		return
+
+	if utils.RunMode == "release" {
+		//缓存校验
+		cacheKey := "xygxxzs_wxtoken"
+		accessTokenStr, _ = utils.Rc.RedisString(cacheKey)
+		if accessTokenStr != "" {
+			return
+		} else {
+			WxAccessToken, errWx := GetWxTokenByXzs()
+			if errWx != nil {
+				err = errWx
+				return
+			}
+			accessTokenStr = WxAccessToken.AccessToken
+			utils.Rc.Put(cacheKey, WxAccessToken.AccessToken, time.Second*7000)
+		}
 	} else {
-		WxAccessToken, errWx := GetWxTokenByXzs()
-		if errWx != nil {
-			err = errWx
+		accessTokenStr, err = GetWxAccessToken()
+		if err != nil {
 			return
 		}
-		accessTokenStr = WxAccessToken.AccessToken
-		utils.Rc.Put(cacheKey, WxAccessToken.AccessToken, time.Second*7000)
 	}
 	return
 }