From edb93cf25e08dacbb4efc7f43abf728a99ee4c93 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Wed, 12 Dec 2018 19:12:08 +0800
Subject: [PATCH] - cms.GetProductInfoByBarCode

---
 conf/app.conf                         |  2 ++
 controllers/cms.go                    | 15 +++++++++++++++
 globals/api/api.go                    |  3 +++
 routers/commentsRouter_controllers.go |  8 ++++++++
 4 files changed, 28 insertions(+)

diff --git a/conf/app.conf b/conf/app.conf
index 323d11ce4..58e68a6c4 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -33,6 +33,8 @@ qiniuAK = "bKWilgyrJlc8aXgLEpCUmRrYcxJ8OYhoKk5mO3jJ"
 qiniuSK = "3MNdU_lKnu22vrNtUELDcLBv23UOUWYKzc16Pmkj"
 qiniuBucket = "jingxistandardlib"
 
+showAppID = 82806
+showAppSecret = "384f911735334bf7a150f3bd3bdf0c1e"
 [dev]
 jdToken  = "c8854ef2-f80a-45ee-aceb-dc8014d646f8"
 jdAppKey = "06692746f7224695ad4788ce340bc854"
diff --git a/controllers/cms.go b/controllers/cms.go
index 516c138c6..68dcbb619 100644
--- a/controllers/cms.go
+++ b/controllers/cms.go
@@ -4,6 +4,7 @@ import (
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jxstore/cms"
 	"git.rosy.net.cn/jx-callback/business/jxutils/configindb"
+	"git.rosy.net.cn/jx-callback/globals/api"
 	"github.com/astaxie/beego"
 )
 
@@ -134,3 +135,17 @@ func (c *CmsController) SetConfig() {
 		return retVal, "", err
 	})
 }
+
+// @Title 从条形码得到商品信息
+// @Description 从条形码得到商品信息
+// @Param	token			header		string	true	"认证token"
+// @Param	barCode			query		string	true	"条形码"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /GetProductInfoByBarCode [get]
+func (c *CmsController) GetProductInfoByBarCode() {
+	c.callGetProductInfoByBarCode(func(params *tCmsGetProductInfoByBarCodeParams) (retVal interface{}, errCode string, err error) {
+		retVal, err = api.ShowAPI.GetProductInfoByBarCode(params.BarCode)
+		return retVal, "", err
+	})
+}
diff --git a/globals/api/api.go b/globals/api/api.go
index ef4ff0263..7411e4362 100644
--- a/globals/api/api.go
+++ b/globals/api/api.go
@@ -8,6 +8,7 @@ import (
 	"git.rosy.net.cn/baseapi/platformapi/jdapi"
 	"git.rosy.net.cn/baseapi/platformapi/mtpsapi"
 	"git.rosy.net.cn/baseapi/platformapi/mtwmapi"
+	"git.rosy.net.cn/baseapi/platformapi/showapi"
 	"git.rosy.net.cn/baseapi/platformapi/weixinapi"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jxutils/cache"
@@ -28,6 +29,7 @@ var (
 	WeixinAPI   *weixinapi.API
 	AutonaviAPI *autonavi.API
 	QiniuAPI    *qbox.Mac
+	ShowAPI     *showapi.API
 
 	Cacher cache.ICacher
 )
@@ -54,6 +56,7 @@ func Init() {
 	if !beego.AppConfig.DefaultBool("disableEbai", false) {
 		EbaiAPI = ebaiapi.New(beego.AppConfig.String("ebaiSource"), beego.AppConfig.String("ebaiSecret"))
 	}
+	ShowAPI = showapi.New(beego.AppConfig.DefaultInt("showAppID", 0), beego.AppConfig.DefaultString("showAppSecret", ""))
 	Cacher = redis.New(beego.AppConfig.DefaultString("redisHost", "localhost"), beego.AppConfig.DefaultInt("redisPort", 0), beego.AppConfig.DefaultString("redisPassword", ""))
 }
 
diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go
index 18bc5e3ba..31dec2d24 100644
--- a/routers/commentsRouter_controllers.go
+++ b/routers/commentsRouter_controllers.go
@@ -79,6 +79,14 @@ func init() {
 			MethodParams: param.Make(),
 			Params: nil})
 
+	beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:CmsController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:CmsController"],
+		beego.ControllerComments{
+			Method: "GetProductInfoByBarCode",
+			Router: `/GetProductInfoByBarCode`,
+			AllowHTTPMethods: []string{"get"},
+			MethodParams: param.Make(),
+			Params: nil})
+
 	beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:CmsController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:CmsController"],
 		beego.ControllerComments{
 			Method: "GetQiniuUploadToken",