no message

controllers/user.go

@@ -287,67 +287,6 @@ func (this *UserController) Detail() {
 			}
 			if companyItem != nil && companyItem.CompanyId > 0 {
 				detail.CompanyName = companyItem.CompanyName
-				//if companyItem.Status == "试用" || companyItem.Status == "永续" || companyItem.Status == "正式" {
-				//permissionStr, err := models.GetCompanyPermissionByUser(companyItem.CompanyId)
-				//if err != nil {
-				//	br.Msg = "获取信息失败"
-				//	br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
-				//	return
-				//}
-				var permissionStr string
-				permissionList, err := models.GetCompanyPermissionList(companyItem.CompanyId)
-				if err != nil {
-					br.Msg = "获取信息失败"
-					br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
-					return
-				}
-
-				mapIsUpgrade := make(map[string]string)
-				mapZhukKeGuan := make(map[string]int)
-				for _, v := range permissionList {
-					mapZhukKeGuan[v.PermissionName] += 1
-					if v.IsUpgrade == 1 {
-						mapIsUpgrade[v.PermissionName] = v.PermissionName + "(升级)"
-					}
-				}
-				mapPermissionName := make(map[string]string)
-				//处理升级，并且合并主客观
-				for _, v := range permissionList {
-					if _, ok := mapPermissionName[v.PermissionName]; ok {
-						continue
-					}
-					if _, ok := mapIsUpgrade[v.PermissionName]; ok {
-						permissionStr += mapIsUpgrade[v.PermissionName] + ","
-					} else {
-						if mapZhukKeGuan[v.PermissionName] == 1 {
-							permissionStr += v.Remark + ","
-						} else {
-							permissionStr += v.PermissionName + ","
-						}
-					}
-					mapPermissionName[v.PermissionName] = v.PermissionName
-				}
-				permissionStr = strings.TrimRight(permissionStr, ",")
-				//permissionStrOld, err := models.GetCompanyPermission(companyItem.CompanyId)
-				//if err != nil {
-				//	br.Msg = "获取信息失败"
-				//	br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
-				//	return
-				//}
-				//permissionStrListOld := strings.Split(permissionStrOld, ",")
-				//for _, v := range permissionStrListOld {
-				//	if strings.Count(permissionStr, v) > 1 {
-				//		permissionStr = strings.Replace(permissionStr, v+"(主观)", v, -1)
-				//		permissionStr = strings.Replace(permissionStr, v+"(客观),", "", -1)
-				//	}
-				//}
-
-				detail.PermissionName = permissionStr
-				//} else {
-				if permissionStr == "" {
-					hasPermission = 1
-				}
-				//}
 				detail.SellerName = companyItem.SellerName
 				detail.SellerMobile = companyItem.Mobile
 
@@ -359,6 +298,33 @@ func (this *UserController) Detail() {
 				}
 				detail.ConNum += microRoadshowCollectcount
 
+				// 获取用户所在公司剩余的点
+				companyPointsNum, err := models.GetCompanyPoints(user.CompanyId)
+				if err != nil && err.Error() != utils.ErrNoRow() {
+					br.Msg = "获取信息失败"
+					br.ErrMsg = "获取用户所在公司剩余的点失败,Err:" + err.Error()
+					return
+				}
+				detail.CompanyPointsNum = companyPointsNum
+
+				//查询研选的权限状态
+				var condition string
+				var pars []interface{}
+				condition += " AND company_id = ?  AND status  IN ('正式','试用')  AND chart_permission_id = ?   ORDER BY company_report_permission_id DESC LIMIT 1  "
+				pars = append(pars, user.CompanyId, utils.CHART_PERMISSION_ID_YANXUAN)
+				companyReportPermissionDetail, err := models.GetCompanyReportPermissionDetailByCondition(condition, pars)
+				if err != nil && err.Error() != utils.ErrNoRow() {
+					br.Msg = "获取信息失败"
+					br.ErrMsg = "获取用户所在公司剩余的点失败,Err:" + err.Error()
+					return
+				}
+				if companyReportPermissionDetail == nil {
+					hasPermission = 1
+				} else {
+					detail.PermissionStatus = companyReportPermissionDetail.Status
+					detail.StartDate = companyReportPermissionDetail.StartDate
+					detail.EndDate = companyReportPermissionDetail.EndDate
+				}
 			} else {
 				hasPermission = 1
 			}

models/user.go

@@ -9,23 +9,27 @@ import (
 )
 
 type UserDetail struct {
-	Headimgurl          string `description:"用户头像，最后一个数值代表正方形头像大小（有0、46、64、96、132数值可选，0代表640*640正方形头像），用户没有头像时该项为空"`
-	Mobile              string `description:"手机号码"`
-	Email               string `description:"邮箱"`
-	NickName            string `description:"用户昵称"`
-	RealName            string `description:"用户实际名称"`
-	CompanyName         string `description:"公司名称"`
-	PermissionName      string `description:"拥有权限分类,多个用英文逗号分隔"`
-	HasPermission       int    `description:"1:无该行业权限，不存在权益客户下,2：潜在客户，未提交过申请，3：潜在客户,已提交过申请"`
-	SellerMobile        string `description:"销售手机号"`
-	SellerName          string `description:"销售名称"`
-	Note                string `json:"-" description:"申请提交时，公司名称"`
-	CountryCode         string `description:"区号"`
-	OutboundMobile      string `description:"外呼手机号"`
-	OutboundCountryCode string `description:"外呼手机号区号"`
-	ConNum              int    `description:"收藏"`
-	HistoryNum          int    `description:"足迹"`
-	ScheduleNum         int    `description:"活动日程"`
+	Headimgurl          string  `description:"用户头像，最后一个数值代表正方形头像大小（有0、46、64、96、132数值可选，0代表640*640正方形头像），用户没有头像时该项为空"`
+	Mobile              string  `description:"手机号码"`
+	Email               string  `description:"邮箱"`
+	NickName            string  `description:"用户昵称"`
+	RealName            string  `description:"用户实际名称"`
+	CompanyName         string  `description:"公司名称"`
+	PermissionName      string  `description:"拥有权限分类,多个用英文逗号分隔"`
+	HasPermission       int     `description:"1:无该行业权限，不存在权益客户下,2：潜在客户，未提交过申请，3：潜在客户,已提交过申请"`
+	SellerMobile        string  `description:"销售手机号"`
+	SellerName          string  `description:"销售名称"`
+	Note                string  `json:"-" description:"申请提交时，公司名称"`
+	CountryCode         string  `description:"区号"`
+	OutboundMobile      string  `description:"外呼手机号"`
+	OutboundCountryCode string  `description:"外呼手机号区号"`
+	ConNum              int     `description:"收藏"`
+	HistoryNum          int     `description:"足迹"`
+	ScheduleNum         int     `description:"活动日程"`
+	PermissionStatus    string  `description:"状态"`
+	StartDate           string  `description:"开始日期"`
+	EndDate             string  `description:"结束日期"`
+	CompanyPointsNum    float64 `description:"公司剩余点数"`
 }
 
 func GetUserDetailByUserId(userId int) (item *UserDetail, err error) {
@@ -45,8 +49,10 @@ func GetArticleUserHistoryNum(userId int) (count int, err error) {
 
 // 我的日程数量
 func GetArticleUserScheduleNum(userId int) (count int, err error) {
-	sql := `SELECT COUNT( 1 ) AS count FROM	cygx_my_schedule AS a INNER JOIN cygx_activity AS art ON art.activity_id = a.activity_id WHERE
-		a.user_id = ? AND art.publish_status = 1 AND art.active_state != 3  `
+	sql := `SELECT COUNT( 1 ) AS count
+			FROM	cygx_my_schedule AS a 
+			INNER JOIN cygx_activity AS art ON art.activity_id = a.activity_id
+			WHERE a.user_id = ? AND art.publish_status = 1 AND art.active_state != 3  AND art.chart_permission_id = 31   `
 	err = orm.NewOrm().Raw(sql, userId).QueryRow(&count)
 	return
 }