From e552c8453e21f5eb99340e6f56c6840f1643c669 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, 26 Mar 2021 14:48:20 +0800
Subject: [PATCH] aa

---
 business/model/dao/common.go         | 19 +++++++++++++++++++
 business/partner/purchase/jd/jd.go   | 17 ++++++++++-------
 globals/api/apimanager/apimanager.go |  6 ++----
 3 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/business/model/dao/common.go b/business/model/dao/common.go
index fad360dff..e3cb5941f 100644
--- a/business/model/dao/common.go
+++ b/business/model/dao/common.go
@@ -55,3 +55,22 @@ func GetVendorOrgCode(db *DaoDB, vendorID int, vendorOrgCode, vendorType string)
 	err = GetRows(db, &vendorOrgs, sql, sqlParams)
 	return vendorOrgs, err
 }
+
+func GetVendorOrgCodeByKey(db *DaoDB, vendorID int, appKey string) (vendorOrg *model.VendorOrgCode, err error) {
+	sql := ` 
+		SELECT *
+		  FROM vendor_org_code 
+		 WHERE deleted_at = ? 
+	`
+	sqlParams := []interface{}{utils.DefaultTimeValue}
+	if vendorID != -1 {
+		sql += " AND vendor_id = ?"
+		sqlParams = append(sqlParams, vendorID)
+	}
+	if appKey != "" {
+		sql += " AND app_key = ?"
+		sqlParams = append(sqlParams, appKey)
+	}
+	err = GetRow(db, &vendorOrg, sql, sqlParams)
+	return vendorOrg, err
+}
diff --git a/business/partner/purchase/jd/jd.go b/business/partner/purchase/jd/jd.go
index 79b6b5533..b20207974 100644
--- a/business/partner/purchase/jd/jd.go
+++ b/business/partner/purchase/jd/jd.go
@@ -41,13 +41,16 @@ func GetAPI(appOrgCode string) (apiObj *jdapi.API) {
 }
 
 func AppKey2OrgCode(appKey string) (vendorOrgCode string) {
-	apiList := partner.CurAPIManager.GetAppOrgCodeList(model.VendorIDJD)
-	for _, v := range apiList {
-		jdAPI := partner.CurAPIManager.GetAPI(model.VendorIDJD, v).(*jdapi.API)
-		if jdAPI.GetAppKey() == appKey {
-			vendorOrgCode = v
-			break
-		}
+	// apiList := partner.CurAPIManager.GetAppOrgCodeList(model.VendorIDJD)
+	// for _, v := range apiList {
+	// 	jdAPI := partner.CurAPIManager.GetAPI(model.VendorIDJD, v).(*jdapi.API)
+	// 	if jdAPI.GetAppKey() == appKey {
+	// 		vendorOrgCode = v
+	// 		break
+	// 	}
+	// }
+	if code, err := dao.GetVendorOrgCodeByKey(dao.GetDB(), model.VendorIDJD, appKey); err == nil && code != nil {
+		vendorOrgCode = code.VendorOrgCode
 	}
 	if vendorOrgCode == "" {
 		globals.SugarLogger.Warnf("AppKey2OrgCode appKey:%s get empty vendorOrgCode", appKey)
diff --git a/globals/api/apimanager/apimanager.go b/globals/api/apimanager/apimanager.go
index f2510b6cd..4780fbba5 100644
--- a/globals/api/apimanager/apimanager.go
+++ b/globals/api/apimanager/apimanager.go
@@ -47,12 +47,10 @@ func (a *APIManager) GetAPI(vendorID int, appOrgCode string) (pfAPI interface{})
 			api.JdAPI = jdapi.New(code.Token, code.AppKey, code.AppSecret)
 			pfAPI = api.JdAPI
 			if configs, err := dao.QueryConfigs(dao.GetDB(), "jdStorePageCookie", model.ConfigTypeCookie, ""); err == nil {
-				JdStorePageCookie := configs[0].Value
-				api.JdAPI.SetJdCookie(JdStorePageCookie)
+				api.JdAPI.SetJdCookie(configs[0].Value)
 			}
 			if configs, err := dao.QueryConfigs(dao.GetDB(), "jdStorePageEarning", model.ConfigTypeCookie, ""); err == nil {
-				jdStorePageEarning := configs[0].Value
-				api.JdAPI.SetCookie("user", jdStorePageEarning)
+				api.JdAPI.SetCookie("user", configs[0].Value)
 			}
 		}
 	case model.VendorIDMTWM: