From efdcebdaa9dbf7922aac788ce0f4fae695e5212b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 16 Dec 2019 11:16:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=88=86=E7=B1=BB=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sku.go | 10 +++++++---
 controllers/cms_sku.go      |  4 +---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index 328710bc1..1180a83e3 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -56,7 +56,7 @@ func GetVendorCategories(ctx *jxcontext.Context, vendorID int, parentID string)
 // parentID 为-1表示所有
 func GetCategories(ctx *jxcontext.Context, parentID int) (catList []*dao.SkuCategoryWithVendor, err error) {
 	db := dao.GetDB()
-	cats, err := dao.GetCategories(db, parentID, nil)
+	cats, err := dao.GetCategories(db, parentID, 0, nil)
 	if err == nil {
 		var ids []int
 		for _, v := range cats {
@@ -1292,9 +1292,13 @@ func SortCategorySkus(ctx *jxcontext.Context, catID int, skuIDList []int) (err e
 	return err
 }
 
-func GetJdUpcCodeByName(ctx *jxcontext.Context, name string, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) {
-	pageNo := (offset/pageSize) +1
+func GetJdUpcCodeByName(ctx *jxcontext.Context, name string) (pagedInfo *model.PagedInfo, err error) {
+	pageNo := 1
+	pageSize := 30
 	jdSkus, totalCount, err := api.JdAPI.GetJdUpcCodeByName(name, pageNo, pageSize)
+	for _, v := range jdSkus {
+		fmt.Println(v)
+	}
 	pagedInfo = &model.PagedInfo{
 		Data:       jdSkus,
 		TotalCount: totalCount,
diff --git a/controllers/cms_sku.go b/controllers/cms_sku.go
index 9af021396..b4314bc2a 100644
--- a/controllers/cms_sku.go
+++ b/controllers/cms_sku.go
@@ -380,14 +380,12 @@ func (c *SkuController) GetStoreSkuSalesInfo() {
 // @Description 根据名字查询京东商品UPC信息
 // @Param	token			header		string	true	"认证token"
 // @Param	name			formData	string	true	"商品名"
-// @Param	offset			formData	int		true	"起始序号，只能传入pageSize的整数倍数，比如pageSize为20，offset传入0，20，40..代表第一页，第二页.."
-// @Param	pageSize		formData	int		true	"分页大小"
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult
 // @router /GetJdUpcCodeByName [post]
 func (c *SkuController) GetJdUpcCodeByName() {
 	c.callGetJdUpcCodeByName(func(params *tSkuGetJdUpcCodeByNameParams) (retVal interface{}, errCode string, err error) {
-		retVal, err = cms.GetJdUpcCodeByName(params.Ctx, params.Name, params.Offset, params.PageSize)
+		retVal, err = cms.GetJdUpcCodeByName(params.Ctx, params.Name)
 		return retVal, "", err
 	})
 }