From 593612ed942803424c2a43b6cb1069943c00059a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 13 Dec 2019 18:35:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=90=8D=E5=AD=97=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BA=AC=E4=B8=9Cupc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sku.go           | 11 +++++++++++
 controllers/cms_sku.go                | 16 ++++++++++++++++
 controllers/cms_store.go              |  1 +
 routers/commentsRouter_controllers.go |  9 +++++++++
 4 files changed, 37 insertions(+)

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index 202d80a75..3cb4a226e 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -7,6 +7,8 @@ import (
 	"strings"
 	"time"
 
+	"git.rosy.net.cn/jx-callback/globals/api"
+
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/baseapi/utils/errlist"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
@@ -1289,3 +1291,12 @@ func SortCategorySkus(ctx *jxcontext.Context, catID int, skuIDList []int) (err e
 	}
 	return err
 }
+
+func GetJdUpcCodeByName(ctx *jxcontext.Context, name string, pageNo, pageSize int) (pagedInfo *model.PagedInfo, err error) {
+	jdSkus, totalCount, err := api.JdAPI.GetJdUpcCodeByName(name, pageNo, pageSize)
+	pagedInfo = &model.PagedInfo{
+		Data:       jdSkus,
+		TotalCount: totalCount,
+	}
+	return pagedInfo, err
+}
diff --git a/controllers/cms_sku.go b/controllers/cms_sku.go
index 5a501f55d..1da4e4168 100644
--- a/controllers/cms_sku.go
+++ b/controllers/cms_sku.go
@@ -375,3 +375,19 @@ func (c *SkuController) GetStoreSkuSalesInfo() {
 		return retVal, "", err
 	})
 }
+
+// @Title 根据名字查询京东商品UPC信息
+// @Description 根据名字查询京东商品UPC信息
+// @Param	token			header		string	true	"认证token"
+// @Param	name			formData	string	true	"商品名"
+// @Param	pageNo			formData	int		true	"页码"
+// @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.PageNo, params.PageSize)
+		return retVal, "", err
+	})
+}
diff --git a/controllers/cms_store.go b/controllers/cms_store.go
index 07fcd20e5..63e45f03e 100644
--- a/controllers/cms_store.go
+++ b/controllers/cms_store.go
@@ -634,3 +634,4 @@ func (c *StoreController) SaveAndSendAlarmVendorSnapshot() {
 		return retVal, "", err
 	})
 }
+
diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go
index 7a4fa30ec..974cbc666 100644
--- a/routers/commentsRouter_controllers.go
+++ b/routers/commentsRouter_controllers.go
@@ -1170,6 +1170,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"],
+        beego.ControllerComments{
+            Method: "GetJdUpcCodeByName",
+            Router: `/GetJdUpcCodeByName`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"],
         beego.ControllerComments{
             Method: "GetSensitiveWordList",