Merge branch 'cygx_12.0.1' of http://8.136.199.33:3000/hongze/hongze_cygx

controllers/banner.go

@@ -136,7 +136,8 @@ func (this *BannerController) ListYx() {
 			&models.BannerUrlYxResp{IndexImg: "https://hzstatic.hzinsights.com/banner/yx/2.png", Path: "pages-purchaser/survey/surveySubmit"},
 		}
 		listB = []*models.BannerUrlYxResp{
-			&models.BannerUrlYxResp{IndexImg: "https://hzstatic.hzinsights.com/banner/yx/3.png", Path: "pages-purchaser/researchList/researchList"},
+			&models.BannerUrlYxResp{IndexImg: "https://hzstatic.hzinsights.com/banner/yx/4_short.png", Path: "pages-purchaser/specialColumn/specialColumn"},
+			//&models.BannerUrlYxResp{IndexImg: "https://hzstatic.hzinsights.com/banner/yx/3.png", Path: "pages-purchaser/researchList/researchList"},
 		}
 	}
 

controllers/yanxuan_special.go

@@ -2,9 +2,11 @@ package controllers
 
 import (
 	"encoding/json"
+	"github.com/rdlucklib/rdluck_tools/paging"
 	"hongze/hongze_cygx/models"
 	"hongze/hongze_cygx/services"
 	"hongze/hongze_cygx/utils"
+	"strings"
 	"time"
 )
 
@@ -14,8 +16,10 @@ type YanxuanSpecialController struct {
 
 // @Title 专栏列表
 // @Description 专栏列表
-// @Param	request	body help_doc.AddHelpDocReq true "type json string"
-// @Success 200 {object} models.AddEnglishReportResp
+// @Param   UserId   query   int  true       "用户ID"
+// @Param   PageSize   query   int  true       "每页数据条数"
+// @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
+// @Success 200 {object} models.SpecialListResp
 // @router /list [get]
 func (this *YanxuanSpecialController) List() {
 	br := new(models.BaseResponse).Init()
@@ -30,33 +34,38 @@ func (this *YanxuanSpecialController) List() {
 		br.Ret = 408
 		return
 	}
-
 	userId, _ := this.GetInt("UserId", 0)
+	pageSize, _ := this.GetInt("PageSize")
+	currentIndex, _ := this.GetInt("CurrentIndex")
+
+	var startSize int
+	if pageSize <= 0 {
+		pageSize = utils.PageSize20
+	}
+	if currentIndex <= 0 {
+		currentIndex = 1
+	}
+	startSize = utils.StartIndex(currentIndex, pageSize)
+	resp := new(models.SpecialListResp)
 	var condition string
 	var pars []interface{}
 
-	var specialUser *models.CygxYanxuanSpecialAuthorItem
-	var err error
 	if userId > 0 {
 		condition += ` AND a.user_id = ? `
 		pars = append(pars, userId)
 	}
-
-	cond := ``
-	cond += ` AND a.status = 1 `
-	specialUser, err = models.GetYanxuanSpecialAuthor(sysUser.UserId, sysUser.UserId, cond)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	condition += ` AND a.status = 3 `
+	total, err := models.GetCygxYanxuanSpecialCount(condition, pars)
+	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败, Err:" + err.Error()
 		return
 	}
 
-	condition += ` AND a.status = 3 `
-
-	list, tmpErr := models.GetYanxuanSpecialList(sysUser.UserId, condition, pars)
-	if tmpErr != nil {
+	list, err := models.GetYanxuanSpecialList(sysUser.UserId, condition, pars, startSize, pageSize)
+	if err != nil {
 		br.Msg = "获取失败"
-		br.ErrMsg = "获取失败, Err:" + tmpErr.Error()
+		br.ErrMsg = "获取失败, Err:" + err.Error()
 		return
 	}
 	for _, v := range list {
@@ -98,12 +107,13 @@ func (this *YanxuanSpecialController) List() {
 			v.Tags += v.IndustryTags
 		}
 	}
-	resp := new(models.SpecialListResp)
 
-	if specialUser != nil {
-		resp.IsAuthor = true
-	}
+	isAuthor, isImproveInformation := services.GetYanxuanSpecialAuthorInfo(sysUser) //用户是否没开通研选专栏以及，专栏信息是否完善
+	resp.IsAuthor = isAuthor
+	resp.IsImproveInformation = isImproveInformation
 	resp.List = list
+	page := paging.GetPaging(currentIndex, pageSize, total)
+	resp.Paging = page
 
 	br.Data = resp
 	br.Ret = 200
@@ -113,7 +123,8 @@ func (this *YanxuanSpecialController) List() {
 
 // @Title 专栏详情
 // @Description 专栏详情
-// @Param	request	body help_doc.AddHelpDocReq true "type json string"
+// @Param   IsSendWx   query   int  false       "是否是通过微信模版进来的 1是，其它否"
+// @Param   Id   query   int  true       "详情ID"
 // @Success 200 {object} models.AddEnglishReportResp
 // @router /detail [get]
 func (this *YanxuanSpecialController) Detail() {
@@ -131,6 +142,7 @@ func (this *YanxuanSpecialController) Detail() {
 	}
 
 	specialId, _ := this.GetInt("Id", 0)
+	isSendWx, _ := this.GetInt("IsSendWx", 0)
 
 	if specialId <= 0 {
 		br.Msg = "参数错误"
@@ -149,6 +161,8 @@ func (this *YanxuanSpecialController) Detail() {
 	}
 
 	var resp models.CygxYanxuanSpecialResp
+
+	resp.HasPermission = 1
 	resp.CygxYanxuanSpecialItem = *item
 	if item.DocUrl != "" {
 		var docs []models.Doc
@@ -172,6 +186,28 @@ func (this *YanxuanSpecialController) Detail() {
 		resp.IndustryTags = append(resp.IndustryTags, item.IndustryTags)
 	}
 
+	if isSendWx == 1 {
+		if item.UserId == sysUser.UserId {
+			resp.IsShowExamine = true
+		}
+		resp.ExamineStatus = item.Status
+	}
+	resp.ExamineStatus = item.Status
+
+	//如果状态未审核通过，而且查看的不是本人，不是审核人员，就无法查看详情
+	var configCode string
+	configCode = utils.TPL_MSG_WANG_FANG_WANG_YANG
+	cnf, err := models.GetConfigByCode(configCode)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败, Err:" + err.Error()
+		return
+	}
+	if item.UserId != sysUser.UserId && item.Status != 3 && !strings.Contains(cnf.ConfigValue, sysUser.Mobile) {
+		resp.CygxYanxuanSpecialItem = *new(models.CygxYanxuanSpecialItem) // 如果内容不可见，就把内容置空
+		resp.HasPermission = 2
+	}
+
 	go services.AddSpecialRecord(this.User, specialId)
 
 	br.Data = resp
@@ -551,7 +587,7 @@ func (this *YanxuanSpecialController) Center() {
 	condition += ` AND a.status = ? `
 	pars = append(pars, status)
 
-	list, tmpErr := models.GetYanxuanSpecialList(sysUser.UserId, condition, pars)
+	list, tmpErr := models.GetYanxuanSpecialList(sysUser.UserId, condition, pars, 0, 0)
 	if tmpErr != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败, Err:" + tmpErr.Error()
@@ -559,17 +595,17 @@ func (this *YanxuanSpecialController) Center() {
 	}
 
 	for _, v := range list {
+		//如果在web端有样式或者上传了文件，小程序就禁止编辑修改内容
 		hasStyle, err := utils.ArticleHasStyle(v.Content)
 		if err != nil {
 			return
 		}
-		v.ContentHasStyle = hasStyle
 		hasImg, err := utils.ArticleHasImgUrl(v.Content)
 		if err != nil {
 			return
 		}
-		if hasImg {
-			v.ContentHasStyle = hasImg
+		if hasStyle || strings.Contains(v.DocUrl, "http") || hasImg {
+			v.ContentHasStyle = true
 		}
 	}
 
@@ -833,7 +869,8 @@ func (this *YanxuanSpecialController) Cancel() {
 
 // @Title 作者列表
 // @Description 作者列表
-// @Param	request	body help_doc.AddHelpDocReq true "type json string"
+// @Param   PageSize   query   int  true       "每页数据条数"
+// @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
 // @Success 200 {object} models.AddEnglishReportResp
 // @router /author/list [get]
 func (this *YanxuanSpecialController) AuthorList() {
@@ -849,35 +886,52 @@ func (this *YanxuanSpecialController) AuthorList() {
 		br.Ret = 408
 		return
 	}
-	var specialUser *models.CygxYanxuanSpecialAuthorItem
-	var err error
 
-	cond := ``
-	cond += ` AND a.status = 1 `
-	specialUser, err = models.GetYanxuanSpecialAuthor(sysUser.UserId, sysUser.UserId, cond)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	pageSize, _ := this.GetInt("PageSize")
+	currentIndex, _ := this.GetInt("CurrentIndex")
+
+	var startSize int
+	if pageSize <= 0 {
+		pageSize = utils.PageSize20
+	}
+	if currentIndex <= 0 {
+		currentIndex = 1
+	}
+	startSize = utils.StartIndex(currentIndex, pageSize)
+	var condition string
+	var pars []interface{}
+	condition += ` AND  a.nick_name <> ''   `
+
+	total, err := models.GetCygxYanxuanSpecialAuthorCount(condition, pars)
+	if err != nil {
 		br.Msg = "获取失败"
-		br.ErrMsg = "获取失败, Err:" + err.Error()
+		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
-
-	list, tmpErr := models.GetYanxuanSpecialAuthorList()
+	condition += `	ORDER BY latest_publish_time DESC`
+	list, tmpErr := models.GetYanxuanSpecialAuthorList(condition, pars, startSize, pageSize)
 	if tmpErr != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败, Err:" + tmpErr.Error()
 		return
 	}
 
+	var userIds []int
 	for _, v := range list {
 		v.LatestPublishDate = v.LatestPublishTime.Format(utils.FormatDate) + "更新"
+		userIds = append(userIds, v.UserId)
 	}
-	resp := new(models.SpecialAuthorListResp)
 
-	if specialUser != nil {
-		resp.IsAuthor = true
+	bestNew := services.GetBestNewYanxuanSpecialByUserId(userIds)
+	for _, v := range list {
+		v.YanxuanSpecialCenter = bestNew[v.UserId]
 	}
+	resp := new(models.SpecialAuthorListResp)
+	isAuthor, _ := services.GetYanxuanSpecialAuthorInfo(sysUser) //用户是否没开通研选专栏以及，专栏信息是否完善
+	resp.IsAuthor = isAuthor
+	page := paging.GetPaging(currentIndex, pageSize, total)
 	resp.List = list
-
+	resp.Paging = page
 	br.Data = resp
 	br.Ret = 200
 	br.Success = true

models/cygx_yanxuan_special.go

@@ -2,6 +2,7 @@ package models
 
 import (
 	"github.com/beego/beego/v2/client/orm"
+	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
 
@@ -56,9 +57,12 @@ type CygxYanxuanSpecialItem struct {
 
 type CygxYanxuanSpecialResp struct {
 	CygxYanxuanSpecialItem
-	Docs         []Doc
-	CompanyTags  []string
-	IndustryTags []string
+	Docs          []Doc
+	CompanyTags   []string
+	IndustryTags  []string
+	HasPermission int  `description:"1:正常展示，2：不展示"`
+	ExamineStatus int  `description:"1:未发布，2:审核中 3:已发布 4:驳回"`
+	IsShowExamine bool `description:"是否展示审核状态按钮"`
 }
 
 type CygxYanxuanSpecialCenterResp struct {
@@ -103,7 +107,7 @@ type Doc struct {
 	DocIcon   string
 }
 
-func GetYanxuanSpecialList(userId int, condition string, pars []interface{}) (items []*CygxYanxuanSpecialCenterResp, err error) {
+func GetYanxuanSpecialList(userId int, condition string, pars []interface{}, startSize, pageSize int) (items []*CygxYanxuanSpecialCenterResp, err error) {
 	o := orm.NewOrm()
 	sql := ``
 	sql = `SELECT a.*,b.bg_img,b.head_img,b.introduction,b.label,b.mobile,b.nick_name,b.real_name,b.special_name,
@@ -116,7 +120,27 @@ JOIN cygx_yanxuan_special_author AS b ON a.user_id = b.user_id
 		sql += condition
 	}
 	sql += `ORDER BY a.publish_time DESC `
-	_, err = o.Raw(sql, userId, pars).QueryRows(&items)
+	if startSize+pageSize > 0 {
+		sql += ` LIMIT ?,? `
+		_, err = o.Raw(sql, userId, pars, startSize, pageSize).QueryRows(&items)
+	} else {
+		_, err = o.Raw(sql, userId, pars).QueryRows(&items)
+	}
+	return
+}
+
+func GetYanxuanSpecialListBycondition(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxYanxuanSpecialCenterResp, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT a.* FROM cygx_yanxuan_special AS a WHERE 1=1 `
+	if condition != "" {
+		sql += condition
+	}
+	if startSize+pageSize > 0 {
+		sql += ` LIMIT ?,? `
+		_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	} else {
+		_, err = o.Raw(sql, pars).QueryRows(&items)
+	}
 	return
 }
 
@@ -135,8 +159,10 @@ func EnableYanxuanSpecial(id, status int, reason string) (err error) {
 }
 
 type SpecialListResp struct {
-	List     []*CygxYanxuanSpecialCenterResp
-	IsAuthor bool
+	IsAuthor             bool               `description:"是否开通了研选专栏"`
+	IsImproveInformation bool               `description:"作者信息是否完善"`
+	Paging               *paging.PagingItem `description:"分页数据"`
+	List                 []*CygxYanxuanSpecialCenterResp
 }
 
 func GetYanxuanSpecialById(specialId, userId int) (item *CygxYanxuanSpecialItem, err error) {
@@ -257,7 +283,7 @@ JOIN cygx_yanxuan_special_author AS b ON a.user_id = b.user_id
 
 // 获取数量
 func GetCygxYanxuanSpecialCount(condition string, pars []interface{}) (count int, err error) {
-	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_yanxuan_special WHERE 1= 1  `
+	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_yanxuan_special as a  WHERE 1= 1  `
 	if condition != "" {
 		sqlCount += condition
 	}

models/cygx_yanxuan_special_user.go

@@ -2,6 +2,7 @@ package models
 
 import (
 	"github.com/beego/beego/v2/client/orm"
+	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
 
@@ -23,28 +24,36 @@ type CygxYanxuanSpecialAuthor struct {
 }
 
 type CygxYanxuanSpecialAuthorItem struct {
-	Id                int       `orm:"column(id);pk"`
-	UserId            int       // 用户ID
-	SpecialName       string    // 专栏名称
-	Introduction      string    // 介绍
-	Label             string    // 标签
-	NickName          string    // 昵称
-	RealName          string    // 姓名
-	CompanyName       string    // 公司名
-	Mobile            string    // 手机号
-	CreateTime        string    // 创建时间
-	ModifyTime        time.Time // 修改时间
-	HeadImg           string    // 头像
-	BgImg             string    // 背景图
-	BgImgDown         string    // 背景图下半部分
-	Status            int       // 1启用2禁用
-	CollectNum        int       // 被收藏数
-	FollowNum         int       // 被关注数
-	SpecialArticleNum int       // 文章数
-	LatestPublishTime time.Time // 最近更新时间
-	LatestPublishDate string    // 最近更新时间
-	IsFollow          int       // 是否已关注 1已关注 0 未关注
-	HasChangeHeadImg  int       // 是否更换过默认头像 1是，0否
+	Id                   int                                 `orm:"column(id);pk"`
+	UserId               int                                 // 用户ID
+	SpecialName          string                              // 专栏名称
+	Introduction         string                              // 介绍
+	Label                string                              // 标签
+	NickName             string                              // 昵称
+	RealName             string                              // 姓名
+	CompanyName          string                              // 公司名
+	Mobile               string                              // 手机号
+	CreateTime           string                              // 创建时间
+	ModifyTime           time.Time                           // 修改时间
+	HeadImg              string                              // 头像
+	BgImg                string                              // 背景图
+	BgImgDown            string                              // 背景图下半部分
+	Status               int                                 // 1启用2禁用
+	CollectNum           int                                 // 被收藏数
+	FollowNum            int                                 // 被关注数
+	SpecialArticleNum    int                                 // 文章数
+	LatestPublishTime    time.Time                           // 最近更新时间
+	LatestPublishDate    string                              // 最近更新时间
+	IsFollow             int                                 // 是否已关注 1已关注 0 未关注
+	HasChangeHeadImg     int                                 // 是否更换过默认头像 1是，0否
+	YanxuanSpecialCenter *CygxYanxuanSpecialCenterAuthorResp // 研选专栏文章内容
+}
+
+type CygxYanxuanSpecialCenterAuthorResp struct {
+	Id          int    //研选专栏ID
+	UserId      int    // 用户ID
+	PublishTime string // 提审过审或驳回时间
+	Title       string // 标题
 }
 
 func AddCygxYanxuanSpecialAuthor(item *CygxYanxuanSpecialAuthor) (lastId int64, err error) {
@@ -103,7 +112,18 @@ func UpdateYanxuanSpecialAuthor(item *CygxYanxuanSpecialAuthor) (err error) {
 	return
 }
 
-func GetYanxuanSpecialAuthorList() (items []*CygxYanxuanSpecialAuthorItem, err error) {
+// 获取数量
+func GetCygxYanxuanSpecialAuthorCount(condition string, pars []interface{}) (count int, err error) {
+	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_yanxuan_special_author as  a  WHERE 1= 1  `
+	if condition != "" {
+		sqlCount += condition
+	}
+	o := orm.NewOrm()
+	err = o.Raw(sqlCount, pars).QueryRow(&count)
+	return
+}
+
+func GetYanxuanSpecialAuthorList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxYanxuanSpecialAuthorItem, err error) {
 	o := orm.NewOrm()
 	sql := ``
 	sql = `SELECT
@@ -111,15 +131,17 @@ func GetYanxuanSpecialAuthorList() (items []*CygxYanxuanSpecialAuthorItem, err e
 	IFNULL(( SELECT publish_time FROM cygx_yanxuan_special WHERE user_id = a.user_id AND STATUS = 3 ORDER BY publish_time DESC LIMIT 1 ), a.modify_time) AS latest_publish_time
 FROM
 	cygx_yanxuan_special_author AS a
-WHERE
-	a.nick_name <> ''
-ORDER BY
-	latest_publish_time DESC `
-	_, err = o.Raw(sql).QueryRows(&items)
+WHERE 1= 1 `
+	if condition != "" {
+		sql += condition
+	}
+	sql += ` LIMIT ?,?  `
+	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
 	return
 }
 
 type SpecialAuthorListResp struct {
+	Paging   *paging.PagingItem `description:"分页数据"`
 	List     []*CygxYanxuanSpecialAuthorItem
 	IsAuthor bool
 }

services/cygx_yanxuan_special.go

@@ -302,3 +302,62 @@ func UpdateYanxuanSpecialResourceData(sourceId int) {
 	}
 	return
 }
+
+// 获取研选专栏用户信息
+func GetYanxuanSpecialAuthorInfo(user *models.WxUserItem) (isAuthor, isImproveInformation bool) {
+	var err error
+	defer func() {
+		if err != nil {
+			go utils.SendAlarmMsg(fmt.Sprint("获取研选专栏用户信息失败,GetYanxuanSpecialAuthorInfo Err ", err, "userId", user.UserId), 2)
+		}
+	}()
+	var condition string
+	condition += ` AND a.status = 1 `
+	specialUser, e := models.GetYanxuanSpecialAuthor(user.UserId, user.UserId, condition)
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		err = errors.New("GetYanxuanSpecialAuthor, Err: " + e.Error())
+		return
+	}
+	if specialUser != nil {
+		isAuthor = true
+		//如果昵称 、专栏名称、简介 都不为空就表示信息完善
+		if specialUser.SpecialName != "" && specialUser.Introduction != "" && specialUser.NickName != "" {
+			isImproveInformation = true
+		}
+	}
+	return
+}
+
+// 获取专栏用户最新的一篇文章信息
+func GetBestNewYanxuanSpecialByUserId(userIds []int) (mapResp map[int]*models.CygxYanxuanSpecialCenterAuthorResp) {
+	lenArr := len(userIds)
+	if lenArr == 0 {
+		return
+	}
+	var err error
+	defer func() {
+		if err != nil {
+			fmt.Println(err)
+			go utils.SendAlarmMsg(fmt.Sprint("获取研选专栏用户信息失败,GetBestNewYanxuanSpecialByUserId Err ", err, "userIds", userIds), 2)
+		}
+	}()
+	var condition string
+	var pars []interface{}
+	condition += `  AND  a.publish_time = ( SELECT max( b.publish_time ) FROM cygx_yanxuan_special b WHERE a.user_id = b.user_id  AND b.STATUS = 3 )  AND user_id  IN (` + utils.GetOrmInReplace(lenArr) + `) AND a.status = 3  GROUP BY user_id ORDER BY publish_time DESC`
+	pars = append(pars, userIds)
+	list, e := models.GetYanxuanSpecialListBycondition(condition, pars, 0, lenArr)
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		err = errors.New("GetYanxuanSpecialListBycondition, Err: " + e.Error())
+		return
+	}
+	mapResp = make(map[int]*models.CygxYanxuanSpecialCenterAuthorResp, 0)
+	for _, v := range list {
+		item := new(models.CygxYanxuanSpecialCenterAuthorResp)
+		item.UserId = v.UserId
+		item.Id = v.Id
+		item.Title = v.Title
+		item.PublishTime = v.PublishTime
+		mapResp[v.UserId] = item
+	}
+	return
+}

services/es_comprehensive.go

@@ -1464,7 +1464,7 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
 		pars = make([]interface{}, 0)
 		condition = ` AND a.id IN (` + utils.GetOrmInReplace(lenyanxuanSpecialIds) + `) `
 		pars = append(pars, yanxuanSpecialIds)
-		listyanxuanSpecial, e := models.GetYanxuanSpecialList(user.UserId, condition, pars)
+		listyanxuanSpecial, e := models.GetYanxuanSpecialList(user.UserId, condition, pars, 0, 0)
 		if e != nil {
 			err = errors.New("GetYanxuanSpecialList, Err: " + e.Error())
 			return

services/resource_data.go

@@ -456,7 +456,7 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 		pars = make([]interface{}, 0)
 		condition = ` AND a.id IN (` + utils.GetOrmInReplace(lenyanxuanSpecialIds) + `) `
 		pars = append(pars, yanxuanSpecialIds)
-		listyanxuanSpecial, e := models.GetYanxuanSpecialList(user.UserId, condition, pars)
+		listyanxuanSpecial, e := models.GetYanxuanSpecialList(user.UserId, condition, pars, 0, 0)
 		if e != nil {
 			err = errors.New("GetYanxuanSpecialList, Err: " + e.Error())
 			return