From 391630d33bf4612bff29e51e4fc89876f086c974 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 10:22:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=B9=B3=E5=8F=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0vendorstoreid=20=E9=93=B6=E8=B1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 343eb29c3..c2ce3b835 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -1132,7 +1132,7 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
 	} else if vendorID == model.VendorIDJX {
 		ReCalculateJxPriceLight(db, ctx, storeID)
 	} else if vendorID == model.VendorIDYB {
-		err = checkAppIDAndAppKey(db, storeMap, storeID)
+		err = checkYbParams(db, storeMap, storeID)
 		if err != nil {
 			return nil, err
 		}
@@ -2877,10 +2877,11 @@ func DeletePrinterSeq(ctx *jxcontext.Context, storeIDs []int) (err error) {
 	return err
 }
 
-func checkAppIDAndAppKey(db *dao.DaoDB, storeMap *model.StoreMap, storeID int) (err error) {
+func checkYbParams(db *dao.DaoDB, storeMap *model.StoreMap, storeID int) (err error) {
 	var (
-		appID  = storeMap.YbAppID
-		appKey = storeMap.YbAppKey
+		appID        = storeMap.YbAppID
+		appKey       = storeMap.YbAppKey
+		yinbaoCookie string
 	)
 	if appID == "" {
 		return fmt.Errorf("绑定银豹平台必须输入appID！")
@@ -2901,9 +2902,6 @@ func checkAppIDAndAppKey(db *dao.DaoDB, storeMap *model.StoreMap, storeID int) (
 		}
 	}
 	storeMaps, err := dao.GetStoresMapList2(db, []int{model.VendorIDYB}, nil, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", false)
-	if err != nil {
-		return err
-	}
 	if len(storeMaps) > 0 {
 		for _, v := range storeMaps {
 			if v.YbAppID == appID {
@@ -2914,5 +2912,22 @@ func checkAppIDAndAppKey(db *dao.DaoDB, storeMap *model.StoreMap, storeID int) (
 			}
 		}
 	}
+	stores, err := dao.GetStoreList(db, []int{storeID}, nil, nil, nil, "")
+	if len(stores) > 0 {
+		if configs, err := dao.QueryConfigs(dao.GetDB(), "yinbaoCookie", model.ConfigTypeCookie, ""); err == nil {
+			yinbaoCookie = configs[0].Value
+		}
+		api.YinBaoAPI.SetCookie(".POSPALAUTH30220", yinbaoCookie)
+		result, err := api.YinBaoAPI.LoadSubStoresByUserIdDDLJson()
+		if err != nil {
+			return err
+		}
+		for _, v := range result {
+			if v.Company == stores[0].Name {
+				storeMap.VendorStoreID = utils.Int2Str(v.ID)
+				break
+			}
+		}
+	}
 	return err
 }