From dc5818072902798e053a1ff91a2054887e668bde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 3 Dec 2019 10:45:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store_sku.go | 8 ++++----
 business/model/dao/store_sku.go   | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index 54274907d..1eb5b3e51 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -2121,14 +2121,14 @@ func ReCalculateJxPrice(ctx *jxcontext.Context, storeIDs []int) (err error) {
 	return err
 }
 
-func GetTopSkusByStoreIDs(ctx *jxcontext.Context, storeIDs []int) (skuAndName []*model.SkuAndName, err error) {
+func GetTopSkusByStoreIDs(ctx *jxcontext.Context, storeIDs []int) (skuName []*model.SkuName, err error) {
 	if len(storeIDs) == 0 {
-		return skuAndName, err
+		return skuName, err
 	}
 	db := dao.GetDB()
-	skuAndName, err = dao.GetTopSkusByStoreIDs(db, storeIDs)
+	skuName, err = dao.GetTopSkusByStoreIDs(db, storeIDs)
 	if err != nil {
 		return nil, err
 	}
-	return skuAndName, err
+	return skuName, err
 }
diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index 0418386aa..e9a891a5d 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -663,7 +663,7 @@ func GetStoreSkusByNameIDs(db *DaoDB, storeIDs []int, nameID int) (skuList []*St
 	return skuList, err
 }
 
-func GetTopSkusByStoreIDs(db *DaoDB, storeIDs []int) (skuAndName []*model.SkuAndName, err error) {
+func GetTopSkusByStoreIDs(db *DaoDB, storeIDs []int) (skuName []*model.SkuName, err error) {
 	sql := `
 	SELECT t3.*
 	FROM(
@@ -689,8 +689,8 @@ func GetTopSkusByStoreIDs(db *DaoDB, storeIDs []int) (skuAndName []*model.SkuAnd
 	LIMIT ?
 	`
 	sqlParams = append(sqlParams, 100, 30)
-	err = GetRows(db, &skuAndName, sql, sqlParams...)
-	return skuAndName, err
+	err = GetRows(db, &skuName, sql, sqlParams...)
+	return skuName, err
 }
 
 func SetStoreSkuBindVendorPrice(storeSkuBind *model.StoreSkuBind, vendorID int, vendorPrice int) {