Merge branch 'cygx_9.3.1_0' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

services/company_permission.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 )
 
-//GetCompanyPermission 获取公司对应的权限名称
+// GetCompanyPermission 获取公司对应的权限名称
 func GetCompanyPermission(companyId int) (permissionStr string, err error) {
 	permissionStr, err = models.GetCompanyPermission(companyId)
 	if err != nil {
@@ -18,7 +18,7 @@ func GetCompanyPermission(companyId int) (permissionStr string, err error) {
 	return
 }
 
-//GetCompanyPermissionUpgrade 获取公司对应的升级权限名称
+// GetCompanyPermissionUpgrade 获取公司对应的升级权限名称
 func GetCompanyPermissionUpgrade(companyId int) (permissionStr string, err error) {
 	permissionStr, err = models.GetCompanyPermissionByUserTrip(companyId)
 	if err != nil {
@@ -29,7 +29,7 @@ func GetCompanyPermissionUpgrade(companyId int) (permissionStr string, err error
 	return
 }
 
-//获取用户对应的权限申请状态
+// 获取用户对应的权限申请状态
 func GetUserHasPermission(user *models.WxUserItem) (hasPermission int, sellerName, sellerMobile, popupMsg string, err error) {
 	//HasPermission     int    `description:"操作方式，1:有该行业权限,正常展示，2：无该行业权限，3：潜在客户，未提交过申请，4：潜在客户,已提交过申请，5：有IFCC、无权益"`
 	uid := user.UserId
@@ -68,13 +68,36 @@ func GetUserHasPermission(user *models.WxUserItem) (hasPermission int, sellerNam
 					hasPermission = 5
 				}
 			}
+		} else {
+			sellerItemQy, e := models.GetSellerByCompanyIdCheckFicc(user.CompanyId, 2)
+			if e != nil && e.Error() != utils.ErrNoRow() {
+				err = errors.New("GetSellerByCompanyIdCheckFicc_Qy, Err: " + e.Error())
+				return
+			}
+			if sellerItemQy != nil {
+				hasPermission = 2
+				sellerMobile = sellerItemQy.Mobile
+				sellerName = sellerItemQy.RealName
+			} else {
+				//获取FICC销售信息
+				sellerItemFicc, e := models.GetSellerByCompanyIdCheckFicc(user.CompanyId, 1)
+				if e != nil && e.Error() != utils.ErrNoRow() {
+					err = errors.New("GetSellerByCompanyIdCheckFicc, Err: " + e.Error())
+					return
+				}
+				if sellerItemFicc != nil {
+					hasPermission = 3
+				} else {
+					hasPermission = 5
+				}
+			}
 		}
 	}
 	popupMsg = "需要升级行业套餐权限才可参与此活动，请联系对口销售"
 	return
 }
 
-//获取用户对应的权限申请状态 文章详情
+// 获取用户对应的权限申请状态 文章详情
 func GetUserHasPermissionArticle(user *models.WxUserItem) (hasPermission int, sellerName, sellerMobile, popupMsg string, err error) {
 	//`description:"1:有该行业权限,正常展示，2：无该行业权限，不存在权益客户下，3:无该品类权限，4：潜在客户，未提交过申请，5：潜在客户,已提交过申请"`
 	uid := user.UserId