|
|
@@ -1,6 +1,7 @@
|
|
|
package servers
|
|
|
|
|
|
import (
|
|
|
+ "app.yhyue.com/moapp/jy_docs/rpc/stdlib/type/stdlib"
|
|
|
. "app.yhyue.com/moapp/jybase/api"
|
|
|
"app.yhyue.com/moapp/jybase/common"
|
|
|
"app.yhyue.com/moapp/jybase/go-xweb/xweb"
|
|
|
@@ -32,23 +33,50 @@ func (stdDoc *StdDoc) Search() {
|
|
|
sort := stdDoc.GetString("sort") //排序 tSort dSort vSort
|
|
|
pageNumReq, _ := stdDoc.GetInt("num") //页码 从1开始
|
|
|
pageSizeReq, _ := stdDoc.GetInt("size") //每页数量
|
|
|
+ productType, _ := stdDoc.GetInt("productType") //每页数量
|
|
|
+ docFileType, _ := stdDoc.GetInt("docFileType") //每页数量
|
|
|
pageNum, pageSize, err := public.PageNumParse(pageNumReq, pageSizeReq, config.JyDocsAppConfig.SearchNumLimit)
|
|
|
if err != nil {
|
|
|
return nil, err
|
|
|
}
|
|
|
- if keyWord == "" {
|
|
|
+ if keyWord == "" && tag == "" && productType == 0 {
|
|
|
return nil, fmt.Errorf("检索内容不能为空")
|
|
|
}
|
|
|
if tag == "全部" {
|
|
|
tag = ""
|
|
|
}
|
|
|
- list, total, err := rpc.GetDocQuery(userId, keyWord, tag, pageNum, pageSize, sort)
|
|
|
+ if keyWord == "" && (pageNum > 1 || pageSize > 50 || docFileType != 0) { // / 搜索时关键词不能为空 热门推荐 会员免费 精选推荐时关键词可以为空所以再判断一下页数
|
|
|
+ return nil, fmt.Errorf("参数有误")
|
|
|
+ }
|
|
|
+ // 关键词为空说明不是搜索过来的
|
|
|
+ topKey := fmt.Sprintf("jydoc_searchCache_%s_%d_%s_%d_%d", tag, productType, sort, pageNum, pageSize)
|
|
|
+ if keyWord == "" {
|
|
|
+ listCache := redis.Get("other", topKey)
|
|
|
+ if listCache != nil {
|
|
|
+ return listCache, nil
|
|
|
+ }
|
|
|
+ }
|
|
|
+ list, total, err := rpc.GetDocQuery(userId, keyWord, tag, pageNum, pageSize, sort, productType, docFileType)
|
|
|
if err != nil {
|
|
|
return nil, err
|
|
|
}
|
|
|
if total > config.JyDocsAppConfig.SearchNumLimit {
|
|
|
total = config.JyDocsAppConfig.SearchNumLimit
|
|
|
}
|
|
|
+ returnList := []interface{}{}
|
|
|
+ for _, v := range list {
|
|
|
+ //
|
|
|
+ if v.Source == public.SourceDd {
|
|
|
+ v.PreviewImgId = fmt.Sprintf(config.JyDocsAppConfig.DoudingImg, v.DocId)
|
|
|
+ } else {
|
|
|
+ v.PreviewImgId = fmt.Sprintf("https://%s.%s/%s", config.JyDocsAppConfig.OssBucket.Priv, config.JyDocsAppConfig.OssAdmin, v.PreviewImgId)
|
|
|
+ }
|
|
|
+ returnList = append(returnList, v)
|
|
|
+ }
|
|
|
+ // 存缓存
|
|
|
+ if keyWord == "" && len(returnList) > 0 {
|
|
|
+ redis.Put("other", topKey, list, 60*60*2)
|
|
|
+ }
|
|
|
return map[string]interface{}{
|
|
|
"total": total,
|
|
|
"list": list,
|
|
|
@@ -61,7 +89,14 @@ func (stdDoc *StdDoc) Search() {
|
|
|
}
|
|
|
|
|
|
func (stdDoc *StdDoc) IndexTag() {
|
|
|
- stdDoc.ServeJson(NewResult(config.JyDocsAppConfig.IndexSearchTag, nil))
|
|
|
+ tags, err := rpc.GetIndexTags()
|
|
|
+ stdDoc.ServeJson(NewResult(tags, err))
|
|
|
+}
|
|
|
+
|
|
|
+type returnDetail struct {
|
|
|
+ *stdlib.DocInfo
|
|
|
+ DocMemberPrice int64 `json:"docMemberPrice"`
|
|
|
+ DocMemberDiscount int64 `json:"docMemberDiscount"`
|
|
|
}
|
|
|
|
|
|
func (stdDoc *StdDoc) Detail() {
|
|
|
@@ -82,12 +117,33 @@ func (stdDoc *StdDoc) Detail() {
|
|
|
//ossId清除
|
|
|
detail.OssPdfId = ""
|
|
|
detail.OssDocId = ""
|
|
|
- detail.PreviewImgId = fmt.Sprintf("https://%s.%s/%s", config.JyDocsAppConfig.OssBucket.Priv, config.JyDocsAppConfig.OssAdmin, detail.PreviewImgId)
|
|
|
+ if detail.Source == public.SourceDd {
|
|
|
+ priceConfig := config.JyDocsAppConfig.Price[detail.Source][detail.ProductType]
|
|
|
+ // 豆丁的预览图和价格需要重新计算
|
|
|
+ detail.Price = priceConfig.Rate*detail.Price + priceConfig.Base
|
|
|
+ detail.PreviewImgId = fmt.Sprintf(config.JyDocsAppConfig.DoudingImg, detail.DocId)
|
|
|
+ } else {
|
|
|
+ detail.PreviewImgId = fmt.Sprintf("https://%s.%s/%s", config.JyDocsAppConfig.OssBucket.Priv, config.JyDocsAppConfig.OssAdmin, detail.PreviewImgId)
|
|
|
+ }
|
|
|
+ // 计算会员价
|
|
|
+ rs := returnDetail{
|
|
|
+ DocInfo: detail,
|
|
|
+ DocMemberDiscount: config.JyDocsAppConfig.DocMember.Discount,
|
|
|
+ }
|
|
|
+ // 会员免费
|
|
|
+ if detail.ProductType == public.ProductTypeMemberFree {
|
|
|
+ rs.DocMemberPrice = 0
|
|
|
+ }
|
|
|
+ // 精品 8折
|
|
|
+ if detail.ProductType == public.ProductTypePremium {
|
|
|
+ rs.DocMemberPrice = detail.Price * config.JyDocsAppConfig.DocMember.Discount / 10
|
|
|
+ }
|
|
|
+
|
|
|
go rpc.DocStatistics(userId, docId, rpc.View) //统计下载次数
|
|
|
return map[string]interface{}{
|
|
|
"status": common.If(isBuy, 1, 0),
|
|
|
"collect": common.If(IsCollect, 1, 0),
|
|
|
- "detail": detail,
|
|
|
+ "detail": rs,
|
|
|
}, nil
|
|
|
}()
|
|
|
if errMsg != nil {
|
|
|
@@ -106,7 +162,7 @@ func (stdDoc *StdDoc) Recommend() {
|
|
|
if strings.Index(docTag, ",") > -1 {
|
|
|
docTag = strings.Split(docTag, ",")[0]
|
|
|
}
|
|
|
- list, _, err := rpc.GetDocQuery(userId, "", docTag, 1, num+1, "dSort")
|
|
|
+ list, _, err := rpc.GetDocQuery(userId, "", docTag, 1, num+1, "dSort", 0, 0)
|
|
|
if err != nil {
|
|
|
return nil, err
|
|
|
}
|
|
|
@@ -116,7 +172,11 @@ func (stdDoc *StdDoc) Recommend() {
|
|
|
continue
|
|
|
}
|
|
|
v.DocSummary = ""
|
|
|
- v.PreviewImgId = fmt.Sprintf("https://%s.%s/%s", config.JyDocsAppConfig.OssBucket.Priv, config.JyDocsAppConfig.OssAdmin, v.PreviewImgId)
|
|
|
+ if v.Source == public.SourceDd {
|
|
|
+ v.PreviewImgId = fmt.Sprintf(config.JyDocsAppConfig.DoudingImg, v.DocId)
|
|
|
+ } else {
|
|
|
+ v.PreviewImgId = fmt.Sprintf("https://%s.%s/%s", config.JyDocsAppConfig.OssBucket.Priv, config.JyDocsAppConfig.OssAdmin, v.PreviewImgId)
|
|
|
+ }
|
|
|
returnList = append(returnList, v)
|
|
|
}
|
|
|
return returnList, nil
|
|
|
@@ -182,7 +242,7 @@ func (stdDoc *StdDoc) TopList() {
|
|
|
return listCache, nil
|
|
|
}
|
|
|
log.Println("flush", topKey)
|
|
|
- list, _, err := rpc.GetDocQuery(userId, "", "", 1, num, reqSort)
|
|
|
+ list, _, err := rpc.GetDocQuery(userId, "", "", 1, num, reqSort, 0, 0)
|
|
|
if err != nil {
|
|
|
return nil, err
|
|
|
}
|
wenmenghao