From f2c479e62b5838f5947c8d029bc2a8d29aaa23d3 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Tue, 19 Feb 2019 17:12:27 +0800
Subject: [PATCH] - TmpGetJxBadCommentsByStoreId

---
 business/jxstore/cms/store.go | 6 ++++--
 controllers/cms_store.go      | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index b7e254b1c..a9365c21e 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -608,7 +608,7 @@ func TmpGetJxBadCommentsNo(ctx *jxcontext.Context, storeID int) (count int, err
 	return count, err
 }
 
-func TmpGetJxBadCommentsByStoreId(ctx *jxcontext.Context, storeID, offset, pageSize, commentType int, fromTime, toTime time.Time) (retVal map[string]interface{}, err error) {
+func TmpGetJxBadCommentsByStoreId(ctx *jxcontext.Context, storeID, pageNo, pageSize, commentType int, fromTime, toTime time.Time) (retVal map[string]interface{}, err error) {
 	db := dao.GetDB()
 	sql := `
 	SELECT SQL_CALC_FOUND_ROWS *
@@ -634,6 +634,7 @@ func TmpGetJxBadCommentsByStoreId(ctx *jxcontext.Context, storeID, offset, pageS
 	}
 	sql += " ORDER BY createtime DESC"
 	pageSize = jxutils.FormalizePageSize(pageSize)
+	offset := (pageNo - 1) * pageSize
 	if offset < 0 {
 		offset = 0
 	}
@@ -644,7 +645,8 @@ func TmpGetJxBadCommentsByStoreId(ctx *jxcontext.Context, storeID, offset, pageS
 	defer func() {
 		dao.Rollback(db)
 	}()
-	globals.SugarLogger.Debug(sql)
+	// globals.SugarLogger.Debug(sql)
+	// globals.SugarLogger.Debug(utils.Format4Output(sqlParams, false))
 	if err = dao.GetRows(db, &commentList, sql, sqlParams...); err == nil {
 		retVal = map[string]interface{}{
 			"total": dao.GetLastTotalRowCount(db),
diff --git a/controllers/cms_store.go b/controllers/cms_store.go
index d8312afad..a2ad2bafd 100644
--- a/controllers/cms_store.go
+++ b/controllers/cms_store.go
@@ -207,7 +207,7 @@ func (c *StoreController) TmpGetJxBadCommentsNo() {
 // @Param	jxStoreId		query		int		true	"门店ID"
 // @Param	type			query		int		true	"评论类型，0：差评，1：所有"
 // @Param	page			query		int		true	"起始页，从1开始"
-// @Param	size			query		int		true	"页大小"
+// @Param	size			query		int		true	"页大小（-1表示无限大）"
 // @Param	fromTime		query		string	false	"创建起始时间"
 // @Param	toTime			query		string	false	"创建结束时间"
 // @Success 200 {object} controllers.CallResult
@@ -217,7 +217,7 @@ func (c *StoreController) TmpGetJxBadCommentsByStoreId() {
 	c.callTmpGetJxBadCommentsByStoreId(func(params *tStoreTmpGetJxBadCommentsByStoreIdParams) (retVal interface{}, errCode string, err error) {
 		timeList, err2 := jxutils.BatchStr2Time(params.FromTime, params.ToTime)
 		if err = err2; err == nil {
-			retVal, err = cms.TmpGetJxBadCommentsByStoreId(params.Ctx, params.JxStoreId, (params.Page-1)*params.Size, params.Size, params.Type, timeList[0], timeList[1])
+			retVal, err = cms.TmpGetJxBadCommentsByStoreId(params.Ctx, params.JxStoreId, params.Page, params.Size, params.Type, timeList[0], timeList[1])
 		}
 		return retVal, "", err
 	})