From 405fdbcc17f3bf38b7f00cc7fbc38aa44d460b36 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, 17 Jun 2020 16:20:14 +0800
Subject: [PATCH] =?UTF-8?q?cookie=E8=BF=87=E6=9C=9F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/event/event.go | 121 +++++++++++---------------------
 1 file changed, 42 insertions(+), 79 deletions(-)

diff --git a/business/jxstore/event/event.go b/business/jxstore/event/event.go
index 8eb899bea..fa2557df5 100644
--- a/business/jxstore/event/event.go
+++ b/business/jxstore/event/event.go
@@ -11,10 +11,8 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
-	"git.rosy.net.cn/jx-callback/business/partner/purchase/jd"
 	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
-	"git.rosy.net.cn/jx-callback/globals/api/apimanager"
 )
 
 var (
@@ -149,87 +147,52 @@ func GetCheckVendorCookie(ctx *jxcontext.Context, vendorIDs []int, isAuto bool)
 		errMsg = ""
 	)
 	for _, v := range vendorIDs {
-		appOrgCodeList := apimanager.CurAPIManager.GetAppOrgCodeList(v)
-		if len(appOrgCodeList) > 0 {
-			for _, vv := range appOrgCodeList {
-				cc := &CheckCookie{}
-				var flag = false
-				switch v {
-				case model.VendorIDEBAI:
-					resultMap, err := api.EbaiAPI.GetStoreOrderInfo(ebaiOrderID)
-					if len(resultMap) < 1 && err != nil {
-						if strings.Contains(err.Error(), ebaiErr) || strings.Contains(err.Error(), ebaiErr2) {
-							errMsg += fmt.Sprintf(" 饿百账号:[%v]的Cookie无效了！", vv)
-							flag = true
-						}
-					}
-					// result, err := api.Ebai2API.GetEbaiDepotSku(ebaiapi.EbaiWholeCountryStore, "190700570")
-					// if err != nil || len(result) < 1 {
-					// 	cc := &CheckCookie{}
-					// 	cc.VendorID = v
-					// 	cc.VendorOrgCode = "饿百后台饿鲜达全国账号"
-					// 	cc.Status = "无效"
-					// 	ccList = append(ccList, cc)
-					// 	errMsg += fmt.Sprintf(" 饿百账号:[饿百后台饿鲜达全国账号]的Cookie无效了！", vv)
-					// 	flag = true
-					// }
-					// result2, err2 := api.EbaiAPI.GetExianDaSkuDepot("190600741")
-					// if err2 != nil || result2 == nil {
-					// 	cc := &CheckCookie{}
-					// 	cc.VendorID = v
-					// 	cc.VendorOrgCode = "饿鲜达供应链系统"
-					// 	cc.Status = "无效"
-					// 	ccList = append(ccList, cc)
-					// 	errMsg += fmt.Sprintf(" 饿百账号:[饿鲜达供应链系统]的Cookie无效了！", vv)
-					// 	flag = true
-					// }
-				case model.VendorIDMTWM:
-					_, err := api.MtwmAPI.PackagePriceGet(mtStoreID)
-					if err != nil {
-						if strings.Contains(err.Error(), mtErr) {
-							errMsg += fmt.Sprintf(" 美团账号:[%v]的Cookie无效了！", vv)
-							flag = true
-						}
-						globals.SugarLogger.Debugf("cookieCheck", err)
-					}
-				case model.VendorIDJD:
-					result, err := jd.GetAPI(vv).GetJdUpcCodeByName("", jdUpcCode, 1, 5)
-					if len(result) < 1 && err != nil {
-						if strings.Contains(err.Error(), jdErr) {
-							errMsg += fmt.Sprintf(" 京东账号:[%v]的Cookie无效了！", vv)
-							flag = true
-						}
-					}
-					result2, err2 := api.JdPageAPI.GetCorporationInfo("11926674", "92510108MA68KK3M8P")
-					if err2 != nil || result2 == nil {
-						cc := &CheckCookie{}
-						cc.VendorID = v
-						cc.VendorOrgCode = "京东page账号"
-						cc.Status = "无效"
-						ccList = append(ccList, cc)
-						errMsg += fmt.Sprintf(" 京东page账号:的Cookie无效了！", vv)
-						flag = true
-					}
-				case model.VendorIDJDShop:
-					_, err := api.JdShopAPI.OrderDetail("124350112427")
-					if err != nil {
-						if strings.Contains(err.Error(), "登录") {
-							errMsg += fmt.Sprintf("京东商城:[%v]的Cookie无效了！", vv)
-							flag = true
-						}
-						globals.SugarLogger.Debugf("cookieCheck", err)
-					}
+		cc := &CheckCookie{}
+		var flag = false
+		switch v {
+		case model.VendorIDEBAI:
+			resultMap, err := api.EbaiAPI.GetStoreOrderInfo(ebaiOrderID)
+			if len(resultMap) < 1 && err != nil {
+				if strings.Contains(err.Error(), ebaiErr) || strings.Contains(err.Error(), ebaiErr2) {
+					errMsg += fmt.Sprintf(" 饿百账号:[%v]的Cookie无效了！")
+					flag = true
 				}
-				cc.VendorID = v
-				cc.VendorOrgCode = vv
-				if flag {
-					cc.Status = "无效"
-				} else {
-					cc.Status = "有效"
+			}
+		case model.VendorIDMTWM:
+			_, err := api.MtwmAPI.PackagePriceGet(mtStoreID)
+			if err != nil {
+				if strings.Contains(err.Error(), mtErr) {
+					errMsg += fmt.Sprintf(" 美团账号:[%v]的Cookie无效了！")
+					flag = true
 				}
-				ccList = append(ccList, cc)
+				globals.SugarLogger.Debugf("cookieCheck", err)
+			}
+		case model.VendorIDJD:
+			result, err := api.JdAPI.GetJdUpcCodeByName("", jdUpcCode, 1, 5)
+			if len(result) < 1 && err != nil {
+				if strings.Contains(err.Error(), jdErr) {
+					errMsg += fmt.Sprintf(" 京东账号:[%v]的Cookie无效了！")
+					flag = true
+				}
+			}
+		case model.VendorIDJDShop:
+			_, err := api.JdShopAPI.OrderDetail("124350112427")
+			if err != nil {
+				if strings.Contains(err.Error(), "登录") {
+					errMsg += fmt.Sprintf("京东商城:[%v]的Cookie无效了！")
+					flag = true
+				}
+				globals.SugarLogger.Debugf("cookieCheck", err)
 			}
 		}
+		cc.VendorID = v
+		cc.VendorOrgCode = ""
+		if flag {
+			cc.Status = "无效"
+		} else {
+			cc.Status = "有效"
+		}
+		ccList = append(ccList, cc)
 	}
 	if isAuto && errMsg != "" {
 		globals.SugarLogger.Warnf("GetCheckVendorCookie：[%v]", errMsg)