From bca6ca821a8ae62d3414334fdfcdef3e186a19ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 30 Mar 2020 15:45:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=93=B6=E8=B1=B9=E5=88=87=E6=8D=A2cookie?=
 =?UTF-8?q?=E7=A7=BB=E5=88=B0cms=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go             | 32 ++++++++++++++++++++++-
 business/partner/purchase/yb/store_sku.go | 23 +++++-----------
 2 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index f7e4aadf1..251ad623c 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -2920,7 +2920,7 @@ func checkYbParams(db *dao.DaoDB, storeMap *model.StoreMap, storeID int) (err er
 			yinbaoCookie = configs[0].Value
 		}
 		api.YinBaoAPI.SetCookie(".POSPALAUTH30220", yinbaoCookie)
-		result, err := api.YinBaoAPI.LoadSubStoresByUserIdDDLJson()
+		result, err := loadSubStoresByUserIdDDLJson()
 		if err != nil {
 			return err
 		}
@@ -2949,3 +2949,33 @@ func checkYbParams(db *dao.DaoDB, storeMap *model.StoreMap, storeID int) (err er
 	}
 	return err
 }
+
+func loadSubStoresByUserIdDDLJson() (result []*yinbaoapi.LoadSubStoresByUserIdDDLJsonResult, err error) {
+	for {
+		result, err = api.YinBaoAPI.LoadSubStoresByUserIdDDLJson()
+		if err == nil {
+			break
+		} else {
+			if yinbaoapi.IsErrCookie(err) {
+				err = ChangeYbCookie()
+				if err != nil {
+					break
+				}
+				result, err = loadSubStoresByUserIdDDLJson()
+			} else {
+				break
+			}
+		}
+	}
+	return result, err
+}
+
+func ChangeYbCookie() (err error) {
+	cookie, err := api.YinBaoAPI.TryGetCookie()
+	if err != nil {
+		return err
+	}
+	api.YinBaoAPI.SetCookie(".POSPALAUTH30220", cookie)
+	UpdateConfig(jxcontext.AdminCtx, "yinbaoCookie", model.ConfigTypeCookie, cookie)
+	return err
+}
diff --git a/business/partner/purchase/yb/store_sku.go b/business/partner/purchase/yb/store_sku.go
index 2ab799678..4877cead5 100644
--- a/business/partner/purchase/yb/store_sku.go
+++ b/business/partner/purchase/yb/store_sku.go
@@ -3,10 +3,9 @@ package yb
 import (
 	"regexp"
 
-	"git.rosy.net.cn/jx-callback/business/jxstore/cms"
-
 	"git.rosy.net.cn/baseapi/platformapi/yinbaoapi"
 	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/business/jxstore/cms"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
@@ -173,7 +172,7 @@ func loadCategorysWithOption(vendorStoreID string) (remoteCats []*yinbaoapi.Load
 			break
 		} else {
 			if yinbaoapi.IsErrCookie(err) {
-				err = changeYbCookie()
+				err = cms.ChangeYbCookie()
 				if err != nil {
 					break
 				}
@@ -208,7 +207,7 @@ func addNewCategory(vendorStoreID, catName, parentCatName string) (vendorCatID s
 			break
 		} else {
 			if yinbaoapi.IsErrCookie(err) {
-				err = changeYbCookie()
+				err = cms.ChangeYbCookie()
 				if err != nil {
 					break
 				}
@@ -239,7 +238,7 @@ func updateCategory(vendorStoreID, vendorCatID, catName, parentCatName string) (
 			break
 		} else {
 			if yinbaoapi.IsErrCookie(err) {
-				err = changeYbCookie()
+				err = cms.ChangeYbCookie()
 				if err != nil {
 					break
 				}
@@ -266,7 +265,7 @@ func deleteCategory(vendorStoreID string, vendorCatIDs []string) (err error) {
 			break
 		} else {
 			if yinbaoapi.IsErrCookie(err) {
-				err = changeYbCookie()
+				err = cms.ChangeYbCookie()
 				if err != nil {
 					break
 				}
@@ -420,7 +419,7 @@ func updateYbSkuPluCode(vendorStoreID, ybBarCode string) (err error) {
 			break
 		} else {
 			if yinbaoapi.IsErrCookie(err) {
-				err = changeYbCookie()
+				err = cms.ChangeYbCookie()
 				if err != nil {
 					break
 				}
@@ -432,13 +431,3 @@ func updateYbSkuPluCode(vendorStoreID, ybBarCode string) (err error) {
 	}
 	return err
 }
-
-func changeYbCookie() (err error) {
-	cookie, err := api.YinBaoAPI.TryGetCookie()
-	if err != nil {
-		return err
-	}
-	api.YinBaoAPI.SetCookie(".POSPALAUTH30220", cookie)
-	cms.UpdateConfig(jxcontext.AdminCtx, "yinbaoCookie", model.ConfigTypeCookie, cookie)
-	return err
-}