From 04b38d334db0a8a765a9afd26f93612f6011e9e7 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Wed, 29 May 2019 10:24:20 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E5=AF=B9=E4=BA=8E=E9=A5=BF=E7=99=BE?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=98=AF=E6=94=B9=E4=BB=B7=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=EF=BC=8C=E5=B0=9D=E8=AF=95=E6=8A=8A=E4=BB=B7=E6=A0=BC=E6=A0=87?=
 =?UTF-8?q?=E5=BF=97=E5=8E=BB=E6=8E=89=E5=86=8D=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/ebai/store_sku.go | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/business/partner/purchase/ebai/store_sku.go b/business/partner/purchase/ebai/store_sku.go
index 824dbec1e..25fae54c0 100644
--- a/business/partner/purchase/ebai/store_sku.go
+++ b/business/partner/purchase/ebai/store_sku.go
@@ -282,7 +282,15 @@ func (p *PurchaseHandler) SyncStoreSkus(ctx *jxcontext.Context, parentTask tasks
 											// globals.SugarLogger.Debugf("SyncStoreSkus test storeSku.EbaiID:%d, err:%v", storeSku.EbaiID, err)
 											updateFields = append(updateFields, model.FieldEbaiID)
 											if globals.EnableEbaiStoreWrite {
-												_, err = api.EbaiAPI.SkuUpdate(strStoreID, storeSku.EbaiID, genSkuParamsFromStoreSkuInfo(storeSku))
+												if _, err = api.EbaiAPI.SkuUpdate(strStoreID, storeSku.EbaiID, genSkuParamsFromStoreSkuInfo(storeSku)); err != nil {
+													// 如果是改价错误，尝试把价格标志去掉再同步
+													if errExt, ok := err.(*utils.ErrorWithCode); ok && errExt.IntCode() == 1 && strings.Index(errExt.ErrMsg(), "sku_参加营销活动") >= 0 {
+														storeSku.EbaiSyncStatus = storeSku.EbaiSyncStatus & ^model.SyncFlagPriceMask
+														if storeSku.EbaiSyncStatus != 0 {
+															api.EbaiAPI.SkuUpdate(strStoreID, storeSku.EbaiID, genSkuParamsFromStoreSkuInfo(storeSku))
+														}
+													}
+												}
 											}
 										}
 									} else {