From 5a6dae8d53d19373c04a2e2500f17c0de17899c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 18 Nov 2020 09:48:34 +0800
Subject: [PATCH] jdshop2

---
 globals/api/api.go                   | 15 +++++++--------
 globals/api/apimanager/apimanager.go |  8 ++++++++
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/globals/api/api.go b/globals/api/api.go
index a1efdd0c9..8e98883a1 100644
--- a/globals/api/api.go
+++ b/globals/api/api.go
@@ -47,11 +47,12 @@ var (
 	JdAPI     *jdapi.API
 	JdPageAPI *jdapi.API
 
-	Jd2API    *jdapi.API
-	Jd3API    *jdapi.API
-	FakeJdAPI *jdapi.API
-	JdEclpAPI *jdeclpapi.API
-	JdShopAPI *jdshopapi.API
+	Jd2API     *jdapi.API
+	Jd3API     *jdapi.API
+	FakeJdAPI  *jdapi.API
+	JdEclpAPI  *jdeclpapi.API
+	JdShopAPI  *jdshopapi.API
+	JdShop2API *jdshopapi.API
 
 	ElmAPI   *elmapi.API
 	EbaiAPI  *ebaiapi.API
@@ -134,9 +135,7 @@ func Init() {
 	}
 	if !beego.AppConfig.DefaultBool("disableJdShop", false) {
 		JdShopAPI = jdshopapi.New(beego.AppConfig.String("jdShopAccessToken"), beego.AppConfig.String("jdShopAppKey"), beego.AppConfig.String("jdShopAppSecret"))
-		// if jdsCookie := beego.AppConfig.DefaultString("jdsCookie", ""); jdsCookie != "" {
-		// 	JdShopAPI.SetCookieWithStr(jdsCookie)
-		// }
+		JdShop2API = jdshopapi.New(beego.AppConfig.String("jdShopAccessToken2"), beego.AppConfig.String("jdShopAppKey2"), beego.AppConfig.String("jdShopAppSecret2"))
 	} else {
 		JdShopAPI = nil
 	}
diff --git a/globals/api/apimanager/apimanager.go b/globals/api/apimanager/apimanager.go
index d40b657df..3580ee17b 100644
--- a/globals/api/apimanager/apimanager.go
+++ b/globals/api/apimanager/apimanager.go
@@ -46,6 +46,12 @@ func (a *APIManager) GetAPI(vendorID int, appOrgCode string) (pfAPI interface{})
 		pfAPI = api.MtwmAPI
 	case model.VendorIDEBAI:
 		pfAPI = api.EbaiAPI
+	case model.VendorIDJDShop:
+		if appOrgCode == "1" {
+			pfAPI = api.JdShopAPI
+		} else {
+			pfAPI = api.JdShop2API
+		}
 	}
 	return pfAPI
 }
@@ -59,6 +65,8 @@ func (a *APIManager) GetAppOrgCodeList(vendorID int) (appOrgCodeList []string) {
 		appOrgCodeList = []string{api.MtwmAPI.GetAppID()}
 	case model.VendorIDEBAI:
 		appOrgCodeList = []string{api.EbaiAPI.GetSource()}
+	case model.VendorIDJDShop:
+		appOrgCodeList = []string{"1", "2"}
 	}
 	return appOrgCodeList
 }