From 1afb9ef1a3d5ded4822eb88da9d7abd1972b3505 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 26 Mar 2020 09:31:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=93=B6=E8=B1=B9api=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/yb/store_sku.go | 26 ++++++++++++++++-------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/business/partner/purchase/yb/store_sku.go b/business/partner/purchase/yb/store_sku.go
index d75a0ec42..a2996d250 100644
--- a/business/partner/purchase/yb/store_sku.go
+++ b/business/partner/purchase/yb/store_sku.go
@@ -165,7 +165,7 @@ func (p *PurchaseHandler) UpdateStoreSkusStock(ctx *jxcontext.Context, vendorOrg
 }
 
 func (p *PurchaseHandler) GetStoreAllCategories(ctx *jxcontext.Context, storeID int, vendorStoreID string) (cats []*partner.BareCategoryInfo, err error) {
-	vendorOrgCode, err := buildYbConfigs(storeID)
+	vendorOrgCode, err := getVendorOrgCode(storeID)
 	if err != nil {
 		return nil, err
 	}
@@ -178,7 +178,7 @@ func (p *PurchaseHandler) GetStoreAllCategories(ctx *jxcontext.Context, storeID
 
 func (p *PurchaseHandler) CreateStoreCategory(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeCat *dao.SkuStoreCatInfo) (err error) {
 	if globals.EnableYbStoreWrite {
-		vendorOrgCode, err := buildYbConfigs(storeID)
+		vendorOrgCode, err := getVendorOrgCode(storeID)
 		if err != nil {
 			return err
 		}
@@ -192,7 +192,7 @@ func (p *PurchaseHandler) CreateStoreCategory(ctx *jxcontext.Context, storeID in
 
 func (p *PurchaseHandler) UpdateStoreCategory(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeCat *dao.SkuStoreCatInfo) (err error) {
 	if globals.EnableYbStoreWrite {
-		vendorOrgCode, err := buildYbConfigs(storeID)
+		vendorOrgCode, err := getVendorOrgCode(storeID)
 		if err != nil {
 			return err
 		}
@@ -203,7 +203,7 @@ func (p *PurchaseHandler) UpdateStoreCategory(ctx *jxcontext.Context, storeID in
 
 func (p *PurchaseHandler) DeleteStoreCategory(ctx *jxcontext.Context, storeID int, vendorStoreID, vendorCatID string, level int) (err error) {
 	if globals.EnableYbStoreWrite {
-		vendorOrgCode, err := buildYbConfigs(storeID)
+		vendorOrgCode, err := getVendorOrgCode(storeID)
 		if err != nil {
 			return err
 		}
@@ -328,7 +328,19 @@ func buildProductInfoParam(storeSku *dao.StoreSkuSyncInfo) (productInfoParam *yi
 	return productInfoParam
 }
 
-func buildYbConfigs(storeID int) (vendorOrgCode string, err error) {
+func buildYbConfigs(storeID int) (err error) {
+	if storeID == 0 {
+		return fmt.Errorf("门店ID不能为空！平台：[%v]", model.VendorIDYB)
+	}
+	store, err := dao.GetStoreDetail(dao.GetDB(), storeID, model.VendorIDYB)
+	if err != nil {
+		return err
+	}
+	api.YinBaoAPI = yinbaoapi.New(store.YbAppKey, store.YbAppID)
+	return err
+}
+
+func getVendorOrgCode(storeID int) (vendorOrgCode string, err error) {
 	if storeID == 0 {
 		return "", fmt.Errorf("门店ID不能为空！平台：[%v]", model.VendorIDYB)
 	}
@@ -336,9 +348,7 @@ func buildYbConfigs(storeID int) (vendorOrgCode string, err error) {
 	if err != nil {
 		return "", err
 	}
-	api.YinBaoAPI = yinbaoapi.New(store.YbAppKey, store.YbAppID)
-	vendorOrgCode = store.VendorOrgCode
-	return vendorOrgCode, err
+	return store.VendorOrgCode, err
 }
 
 func convertVendorCatList(remoteCats []*yinbaoapi.LoadCategorysWithOptionResult) (cats []*partner.BareCategoryInfo) {