From 8d267069b0f6e54615cb17e832f1cfd9d26a42dd Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Wed, 16 Jan 2019 11:45:33 +0800
Subject: [PATCH] - force ignore DeleteRemoteSkus error in
 ebai.FullSyncStoreSkus

---
 business/model/store_sku.go                 | 8 ++++----
 business/partner/purchase/ebai/store_sku.go | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/business/model/store_sku.go b/business/model/store_sku.go
index c676d1ba3..a5f9f2eb6 100644
--- a/business/model/store_sku.go
+++ b/business/model/store_sku.go
@@ -43,11 +43,11 @@ type StoreSkuCategoryMap struct {
 
 	ElmID  int64  `orm:"column(elm_id);index"`
 	EbaiID int64  `orm:"column(ebai_id);index"`
-	MtwmID string `orm:"column(mtwm_id);size(16)"` // 美团外卖没有ID，保存名字
+	MtwmID string `orm:"column(mtwm_id);index;size(16)"` // 美团外卖没有ID，保存名字
 
-	ElmSyncStatus  int8
-	EbaiSyncStatus int8
-	MtwmSyncStatus int8
+	ElmSyncStatus  int8 `orm:"default(2)"`
+	EbaiSyncStatus int8 `orm:"default(2)"`
+	MtwmSyncStatus int8 `orm:"default(2)"`
 }
 
 func (*StoreSkuCategoryMap) TableUnique() [][]string {
diff --git a/business/partner/purchase/ebai/store_sku.go b/business/partner/purchase/ebai/store_sku.go
index 1cfd7cda9..3a1972121 100644
--- a/business/partner/purchase/ebai/store_sku.go
+++ b/business/partner/purchase/ebai/store_sku.go
@@ -149,6 +149,10 @@ func (p *PurchaseHandler) FullSyncStoreSkus(ctx *jxcontext.Context, parentTask t
 		switch step {
 		case 0:
 			err = p.DeleteRemoteSkus(ctx, rootTask, storeID, nil)
+			// 强制忽略删除SKU错误
+			if isContinueWhenError {
+				err = nil
+			}
 		case 1:
 			_, err = p.setStoreSkuSyncStatus(ctx, db, storeID, nil, model.SyncFlagNewMask)
 		case 2: