- refactor ebai SyncStoreSkus

business/partner/purchase/ebai/store_sku.go

@@ -1,6 +1,7 @@
 package ebai
 
 import (
+	"errors"
 	"fmt"
 	"strings"
 	"time"
@@ -74,14 +75,7 @@ var (
 	}
 )
 
-func (p *PurchaseHandler) SyncStoreSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, storeID int, skuIDs []int, isAsync, isContinueWhenError bool) (hint string, err error) {
+func (p *PurchaseHandler) getDirtyStoreSkus(db *dao.DaoDB, storeID int, skuIDs []int) (storeSkuInfoList []*tStoreSkuFullInfo, err error) {
-	userName := ctx.GetUserName()
-	globals.SugarLogger.Debugf("SyncStoreSkus storeID:%d, skuIDs:%v, isContinueWhenError:%t, userName:%s", storeID, skuIDs, isContinueWhenError, userName)
-	db := dao.GetDB()
-
-	if err = p.SyncLocalStoreCategory(db, storeID, userName); err != nil {
-		return "", err
-	}
 	sql := `
 	SELECT t8.price_percentage, t1.*, t2.spec_quality, t2.spec_unit, t2.weight, t2.status sku_status,
 	t3.prefix, t3.name, t2.comment, t3.is_global, t3.unit, t3.img,
@@ -114,10 +108,11 @@ func (p *PurchaseHandler) SyncStoreSkus(ctx *jxcontext.Context, parentTask tasks
 		sql += " AND t1.sku_id IN (" + dao.GenQuestionMarks(len(skuIDs)) + ")"
 		sqlParams = append(sqlParams, skuIDs)
 	}
-	strStoreID := utils.Int2Str(storeID)
+	err = dao.GetRows(db, &storeSkuInfoList, sql, sqlParams...)
-	var storeSkuInfoList []*tStoreSkuFullInfo
+	return storeSkuInfoList, err
-	if err = dao.GetRows(db, &storeSkuInfoList, sql, sqlParams...); err == nil {
+}
-		// globals.SugarLogger.Debug(utils.Format4Output(storeSkuInfoList, false))
+
+func (p *PurchaseHandler) createCatByStoreSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, db *dao.DaoDB, storeID int, storeSkuInfoList []*tStoreSkuFullInfo) (num int64, err error) {
 	catList2Add := make(map[int]int)
 	for _, storeSku := range storeSkuInfoList {
 		if storeSku.EbaiSyncStatus&model.SyncFlagNewMask != 0 {
@@ -129,15 +124,46 @@ func (p *PurchaseHandler) SyncStoreSkus(ctx *jxcontext.Context, parentTask tasks
 			}
 		}
 	}
+	num = int64(len(catList2Add))
+	if num > 0 {
 		for k := range catList2Add {
-			if err = dao.AddStoreCategoryMap(db, storeID, k, model.VendorIDEBAI, "", model.SyncFlagNewMask, userName); err != nil {
+			if err = dao.AddStoreCategoryMap(db, storeID, k, model.VendorIDEBAI, "", model.SyncFlagNewMask, ctx.GetUserName()); err != nil {
-				return "", err
+				return 0, err
 			}
 		}
 		if _, err = p.SyncStoreCategory(ctx, parentTask, storeID, false); err != nil {
+			return 0, err
+		}
+	}
+	return num, nil
+}
+
+func (p *PurchaseHandler) SyncStoreSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, storeID int, skuIDs []int, isAsync, isContinueWhenError bool) (hint string, err error) {
+	userName := ctx.GetUserName()
+	globals.SugarLogger.Debugf("SyncStoreSkus storeID:%d, skuIDs:%v, isContinueWhenError:%t, userName:%s", storeID, skuIDs, isContinueWhenError, userName)
+	db := dao.GetDB()
+
+	if err = p.SyncLocalStoreCategory(db, storeID, userName); err != nil {
 		return "", err
 	}
-		if err = dao.GetRows(db, &storeSkuInfoList, sql, sqlParams...); err == nil {
+	strStoreID := utils.Int2Str(storeID)
+	var storeSkuInfoList []*tStoreSkuFullInfo
+	var num int64
+	for i := 0; i < 3; i++ {
+		if storeSkuInfoList, err = p.getDirtyStoreSkus(db, storeID, skuIDs); err != nil {
+			return "", err
+		}
+		if num, err = p.createCatByStoreSkus(ctx, parentTask, db, storeID, storeSkuInfoList); err != nil {
+			return "", err
+		}
+		if num == 0 {
+			break
+		}
+	}
+	if num != 0 {
+		return "", errors.New("不能创建商品所需的类别")
+	}
+
 	task := tasksch.NewParallelTask("SyncStoreSkus skus", tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), userName, func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 		storeSku := batchItemList[0].(*tStoreSkuFullInfo)
 		updateFields := []string{model.FieldEbaiSyncStatus}
@@ -176,8 +202,7 @@ func (p *PurchaseHandler) SyncStoreSkus(ctx *jxcontext.Context, parentTask tasks
 	}, storeSkuInfoList)
 	tasksch.AddChild(parentTask, task).Run()
 	_, err = task.GetResult(0)
-		}
+
-	}
 	return "", err
 }