- 去掉DeleteRemoteStoreSkus

2019-07-14 17:57:27 +08:00
parent 756b389fdf
commit f5ee2e23b1
7 changed files with 63 additions and 186 deletions
--- a/business/jxstore/cms/sync.go
+++ b/business/jxstore/cms/sync.go
@@ -498,19 +498,17 @@ func (v *VendorSync) DeleteRemoteStoreSkus(ctx *jxcontext.Context, db *dao.DaoDB
 	hint, err = v.LoopStoresMap(ctx, db, fmt.Sprintf("删除远程门店商品信息:%v", storeIDs), isAsync, true, vendorIDs, storeIDs,
 		func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) {
 			loopMapInfo := batchItemList[0].(*LoopStoreMapInfo)
-			if handler := v.GetStoreHandler(loopMapInfo.VendorID); handler != nil {
-				if len(loopMapInfo.StoreMapList) > 1 {
-					loopStoreTask := tasksch.NewSeqTask(fmt.Sprintf("处理平台%s", model.VendorChineseNames[loopMapInfo.VendorID]), ctx,
-						func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) {
-							storeID := loopMapInfo.StoreMapList[step].StoreID
-							_, err = handler.DeleteRemoteStoreSkus(ctx, task, storeID, false, isContinueWhenError)
-							return nil, err
-						}, len(loopMapInfo.StoreMapList))
-					t.AddChild(loopStoreTask).Run()
-					_, err = loopStoreTask.GetResult(0)
-				} else {
-					_, err = handler.DeleteRemoteStoreSkus(ctx, t, loopMapInfo.StoreMapList[0].StoreID, false, isContinueWhenError)
-				}
+			if len(loopMapInfo.StoreMapList) > 1 {
+				loopStoreTask := tasksch.NewSeqTask(fmt.Sprintf("处理平台%s", model.VendorChineseNames[loopMapInfo.VendorID]), ctx,
+					func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) {
+						storeMap := loopMapInfo.StoreMapList[step]
+						_, err = ClearRemoteStoreStuffAndSetNew(ctx, task, storeMap.VendorID, storeMap.StoreID, storeMap.VendorStoreID, false, isContinueWhenError)
+						return nil, err
+					}, len(loopMapInfo.StoreMapList))
+				t.AddChild(loopStoreTask).Run()
+				_, err = loopStoreTask.GetResult(0)
+			} else {
+				_, err = ClearRemoteStoreStuffAndSetNew(ctx, t, loopMapInfo.StoreMapList[0].VendorID, loopMapInfo.StoreMapList[0].StoreID, loopMapInfo.StoreMapList[0].VendorStoreID, false, isContinueWhenError)
 			}
 			return nil, partner.AddVendorInfo2Err(err, loopMapInfo.VendorID)
 		}, isContinueWhenError)
@@ -524,19 +522,17 @@ func (v *VendorSync) PruneMissingStoreSkus(ctx *jxcontext.Context, vendorIDs []i
 	hint, err = v.LoopStoresMap(ctx, dao.GetDB(), fmt.Sprintf("删除远程无关联的门店商品信息:%v", storeIDs), isAsync, true, vendorIDs, storeIDs,
 		func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) {
 			loopMapInfo := batchItemList[0].(*LoopStoreMapInfo)
-			if handler, _ := v.GetStoreHandler(loopMapInfo.VendorID).(partner.ISingleStoreHandler); handler != nil {
-				if len(loopMapInfo.StoreMapList) > 1 {
-					loopStoreTask := tasksch.NewParallelTask(fmt.Sprintf("处理平台%s", model.VendorChineseNames[loopMapInfo.VendorID]), tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), ctx,
-						func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
-							storeMap := batchItemList[0].(*model.StoreMap)
-							_, err = PruneMissingStoreSkus(ctx, task, loopMapInfo.VendorID, storeMap.StoreID, storeMap.VendorStoreID, false, isContinueWhenError)
-							return nil, err
-						}, loopMapInfo.StoreMapList)
-					t.AddChild(loopStoreTask).Run()
-					_, err = loopStoreTask.GetResult(0)
-				} else {
-					_, err = PruneMissingStoreSkus(ctx, t, loopMapInfo.VendorID, loopMapInfo.StoreMapList[0].StoreID, loopMapInfo.StoreMapList[0].VendorStoreID, false, isContinueWhenError)
-				}
+			if len(loopMapInfo.StoreMapList) > 1 {
+				loopStoreTask := tasksch.NewParallelTask(fmt.Sprintf("处理平台%s", model.VendorChineseNames[loopMapInfo.VendorID]), tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), ctx,
+					func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
+						storeMap := batchItemList[0].(*model.StoreMap)
+						_, err = PruneMissingStoreSkus(ctx, task, loopMapInfo.VendorID, storeMap.StoreID, storeMap.VendorStoreID, false, isContinueWhenError)
+						return nil, err
+					}, loopMapInfo.StoreMapList)
+				t.AddChild(loopStoreTask).Run()
+				_, err = loopStoreTask.GetResult(0)
+			} else {
+				_, err = PruneMissingStoreSkus(ctx, t, loopMapInfo.VendorID, loopMapInfo.StoreMapList[0].StoreID, loopMapInfo.StoreMapList[0].VendorStoreID, false, isContinueWhenError)
 			}
 			return nil, partner.AddVendorInfo2Err(err, loopMapInfo.VendorID)
 		}, isContinueWhenError)
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -4,6 +4,7 @@ import (
 	"fmt"

 	"git.rosy.net.cn/jx-callback/business/partner/putils"
+	"git.rosy.net.cn/jx-callback/globals"

 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
@@ -64,3 +65,43 @@ func PruneMissingStoreSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, ven
 	}
 	return hint, err
 }
+
+func ClearRemoteStoreStuffAndSetNew(ctx *jxcontext.Context, parentTask tasksch.ITask, vendorID, storeID int, vendorStoreID string, isAsync, isContinueWhenError bool) (hint string, err error) {
+	userName := ctx.GetUserName()
+	globals.SugarLogger.Debugf("ClearRemoteStoreStuffAndSetNew storeID:%d, isContinueWhenError:%t, userName:%s", storeID, isContinueWhenError, userName)
+	handler, _ := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.ISingleStoreStoreSkuHandler)
+	if handler == nil {
+		return "", fmt.Errorf("平台:%s不支持此操作", model.VendorChineseNames[vendorID])
+	}
+
+	db := dao.GetDB()
+	var errDeleteSku error
+	rootTask := tasksch.NewSeqTask(fmt.Sprintf("ClearRemoteStoreStuffAndSetNew:%s", model.VendorChineseNames[vendorID]), ctx,
+		func(rootTask *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) {
+			switch step {
+			case 0:
+				err = handler.DeleteStoreAllSkus(ctx, rootTask, storeID, vendorStoreID, isContinueWhenError)
+				errDeleteSku = err
+				// 强制忽略删除SKU错误
+				if isContinueWhenError {
+					err = nil
+				}
+				if err == nil {
+					_, err = dao.SetStoreSkuSyncStatus(db, vendorID, []int{storeID}, nil, model.SyncFlagNewMask)
+				}
+			case 1:
+				if err = handler.DeleteStoreAllCategories(ctx, rootTask, storeID, vendorStoreID, isContinueWhenError); err == nil {
+					_, err = dao.SetStoreCategorySyncStatus(db, vendorID, []int{storeID}, nil, model.SyncFlagNewMask)
+				}
+			}
+			return nil, err
+		}, 2)
+	tasksch.AddChild(parentTask, rootTask).Run()
+	if !isAsync {
+		_, err = rootTask.GetResult(0)
+	}
+	if err == nil {
+		err = errDeleteSku
+	}
+	return rootTask.ID, err
+}