补充活动列表

rpc/stdlib/internal/logic/docactivitylogic.go

@@ -31,16 +31,16 @@ func (l *DocActivityLogic) DocActivity(in *stdlib.DocActivityReq) (*stdlib.DocAc
 		pageNum = 0
 	}
 	res, count := stdlibService.DocActivityList(int(in.PageSize), pageNum)
-	docActivityResp := &stdlib.DocActivityResp{Code: 0, Msg: "ok", Total: count}
+	docActivityResp := &stdlib.DocActivityResp{Code: 0, Msg: "ok", Total: int32(count)}
 	for _, v := range res {
 		docActivityResp.Docs = append(docActivityResp.Docs, &stdlib.DocActivity{
-			DocId:      res.DocId,
-			DocImg:     res.DocImg,
-			DocTitle:   res.DocTitle,
-			DocSummary: res.DocSummary,
-			ActivityId: res.ActivityId,
-			Price:      res.Price,
-			CostPrice:  res.CostPrice,
+			DocId:      v.DocId,
+			DocImg:     v.DocImg,
+			DocTitle:   v.DocTitle,
+			DocSummary: v.DocSummary,
+			ActivityId: int32(v.ActivityId),
+			Price:      int32(v.Price),
+			CostPrice:  int32(v.CostPrice),
 		})
 	}
 	return docActivityResp, nil

services/model/stdlib.go

@@ -59,6 +59,6 @@ type DocActivity struct {
 	CostPrice  int    `json:"costPrice"`
 }
 
-func (ud *UserDoc) TableName() string {
+func (ud *DocActivity) TableName() string {
 	return "doc_activity"
 }

services/stdlib/docActivity.go

@@ -1,24 +1,18 @@
 package stdlib
 
 import (
-	"fmt"
-	"log"
-	"time"
-
 	"app.yhyue.com/moapp/jydocs/services/model"
-
-	elastic "app.yhyue.com/moapp/jybase/esv7"
 	jyDocsRpcUtil "app.yhyue.com/moapp/jydocs/services/util"
 )
 
 func DocActivityList(pageSize, pageNum int) ([]model.DocActivity, int) {
 	docActivity := []model.DocActivity{}
-	var count int
+	var count int64
 	jyDocsRpcUtil.GetJyDocsDB().Model(&model.DocActivity{}).Count(&count)
 	if count > 0 {
-		jyDocsRpcUtil.GetJyDocsDB().Model(&model.DocActivity{}).Offset(pageNum * pageSize).Limit(pageSize).Find(&docActivity).Error
+		jyDocsRpcUtil.GetJyDocsDB().Model(&model.DocActivity{}).Offset(pageNum * pageSize).Limit(pageSize).Find(&docActivity)
 	} else {
 		count = 0
 	}
-	return docActivity, count
+	return docActivity, int(count)
 }

services/stdlib/docStatistics.go

@@ -23,7 +23,7 @@ func DocStatistics(docId string, dtype int) bool {
 	if err != nil {
 		//es
 		data := map[string]interface{}{}
-		rs := jyDocsRpcUtil.GetJyDocsDB().Table("doc_statistics").Where("docId = ?", id).Find(&data)
+		jyDocsRpcUtil.GetJyDocsDB().Table("doc_statistics").Where("docId = ?", docId).Find(&data)
 		if len(data) > 0 {
 			//是否缓存
 			//TODO