From 556fa0913d041918e4d9e8323d5de15a87d7119f 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 Mar 2021 16:22:03 +0800
Subject: [PATCH] aa

---
 business/jxstore/cms/sku.go                   | 14 +++++++++++---
 business/partner/purchase/jdshop/store_sku.go |  3 +++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index cc141ef9e..66a3fecbd 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -850,7 +850,7 @@ func AddSkuName(ctx *jxcontext.Context, skuNameExt *model.SkuNameExt, userName s
 	}
 
 	picType := true
-	for _, imgName := range []string{skuNameExt.Img, skuNameExt.Img2} {
+	for _, imgName := range []string{skuNameExt.Img, skuNameExt.Img2, skuNameExt.Img3, skuNameExt.Img4, skuNameExt.Img5} {
 		if imgName != "" {
 			dataRes, err2 := datares.TryRegisterDataResource(ctx, skuNameExt.Name, imgName, model.ImgTypeMain, false)
 			if err = err2; err != nil {
@@ -973,7 +973,7 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf
 			}
 		}
 		globals.SugarLogger.Debugf("UpdateSkuName valid:%s", utils.Format4Output(valid, false))
-		for _, imgName := range []string{"img", "img2", "img3"} {
+		for _, imgName := range []string{"img", "img2", "img3", "img4", "img5"} {
 			if valid[imgName] != nil {
 				if imgStr := utils.Interface2String(valid[imgName]); imgStr != "" {
 					_, err2 := datares.TryRegisterDataResource(ctx, skuName.Name, valid[imgName].(string), model.ImgTypeMain, true)
@@ -2309,6 +2309,14 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader, categoryID
 					result, _ := api.MtwmAPI.GetStandardProductListWithCond(*skuName.Upc)
 					if result != nil {
 						imgs := strings.Split(result.Pic, ",")
+						switch len(imgs) {
+						case 1:
+							skuName.Img = imgs[0]
+						case 2:
+						case 3:
+						case 4:
+						case 5:
+						}
 						if len(imgs) == 1 {
 							skuName.Img = imgs[0]
 						}
@@ -2316,7 +2324,7 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader, categoryID
 							skuName.Img = imgs[0]
 							skuName.Img2 = imgs[1]
 						}
-						if len(imgs) >= 3 {
+						if len(imgs) == 3 {
 							skuName.Img = imgs[0]
 							skuName.Img2 = imgs[1]
 							skuName.Img3 = imgs[2]
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 616b8e08a..7ea359920 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -156,6 +156,9 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
 						if v.VendorOrgCode == "1" {
 							createSkuResult, err2 := getAPI(v.VendorOrgCode).CreateWare(createSkuParamWare, createSkuParamSkus)
 							err = err2
+							if strings.Contains(err.Error(), "cookie可能过期了") {
+								err = nil
+							}
 							wareID = createSkuResult.WareID
 
 							var paramAttrs = make(map[string]*jdshopapi.CreateSkuParamSkus)