From b3943c687d0af3e850cf21edd090ed70bd3fe595 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, 2 Jul 2020 15:42:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=93=B6=E8=B1=B9=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E5=95=86=E5=93=81=E4=BF=AE=E6=94=B9=EF=BC=8C=E7=A6=81=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E4=B9=9F=E6=94=B9=E4=B8=8B=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/yb/store_sku.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/partner/purchase/yb/store_sku.go b/business/partner/purchase/yb/store_sku.go index f7857ef4e..c47b50f30 100644 --- a/business/partner/purchase/yb/store_sku.go +++ b/business/partner/purchase/yb/store_sku.go @@ -41,7 +41,7 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v if strings.Contains(err.Error(), addErr1) { queryProductByBarcodeResult, err := api.YinBaoAPI.QueryProductByBarcodes([]string{storeSku.YbBarCode}) if err != nil && len(queryProductByBarcodeResult) > 0 { - if queryProductByBarcodeResult[0].Enable == model.SkuStatusDeleted { + if queryProductByBarcodeResult[0].Enable == model.SkuStatusDeleted || queryProductByBarcodeResult[0].Enable == model.SkuStatusDontSale { api.YinBaoAPI.BatchUpdateProductEnable(vendorStoreID, utils.Int64ToStr(queryProductByBarcodeResult[0].UID), model.SkuStatusNormal) storeSku.VendorSkuID = utils.Int64ToStr(queryProductByBarcodeResult[0].UID) } From 66e8f15f3cf84a5d51f35f29a86116fefe83a356 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, 2 Jul 2020 16:52:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=93=B6=E8=B1=B9=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E5=95=86=E5=93=81=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 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/business/partner/purchase/yb/store_sku.go b/business/partner/purchase/yb/store_sku.go index c47b50f30..695970895 100644 --- a/business/partner/purchase/yb/store_sku.go +++ b/business/partner/purchase/yb/store_sku.go @@ -38,13 +38,15 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v result, err = api.YinBaoAPI.AddProductInfo(buildProductInfoParam(storeSku)) } if err != nil { - if strings.Contains(err.Error(), addErr1) { - queryProductByBarcodeResult, err := api.YinBaoAPI.QueryProductByBarcodes([]string{storeSku.YbBarCode}) - if err != nil && len(queryProductByBarcodeResult) > 0 { - if queryProductByBarcodeResult[0].Enable == model.SkuStatusDeleted || queryProductByBarcodeResult[0].Enable == model.SkuStatusDontSale { + if errExt, ok := err.(*utils.ErrorWithCode); ok { + if strings.Contains(errExt.ErrMsg(), addErr1) { + queryProductByBarcodeResult, _ := api.YinBaoAPI.QueryProductByBarcodes([]string{storeSku.YbBarCode}) + if len(queryProductByBarcodeResult) > 0 { api.YinBaoAPI.BatchUpdateProductEnable(vendorStoreID, utils.Int64ToStr(queryProductByBarcodeResult[0].UID), model.SkuStatusNormal) storeSku.VendorSkuID = utils.Int64ToStr(queryProductByBarcodeResult[0].UID) } + } else { + failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDYB], "创建商品") } } else { failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDYB], "创建商品")