From 636c45afe336c0c0de61603b5b1e277cc56290d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Mon, 21 Nov 2022 14:26:14 +0800
Subject: [PATCH] 1

---
 business/jxstore/cms/sync_store_sku.go | 16 +++---
 controllers/cms_sku.go                 | 74 +++++++++++++-------------
 2 files changed, 44 insertions(+), 46 deletions(-)

diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index 7a8a765b9..305bdba82 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -678,14 +678,14 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 		// }
 	}
 
-	globals.SugarLogger.Debugf("==============createList=%s", utils.Format4Output(createList, false))
-	globals.SugarLogger.Debugf("===============updateList%s", utils.Format4Output(updateList, false))
-	globals.SugarLogger.Debugf("==============deleteList=%s", utils.Format4Output(deleteList, false))
-	globals.SugarLogger.Debugf("===============priceList%s", utils.Format4Output(priceList, false))
-	globals.SugarLogger.Debugf("===============stockList%s", utils.Format4Output(stockList, false))
-	globals.SugarLogger.Debugf("==============onlineList=%s", utils.Format4Output(onlineList, false))
-	globals.SugarLogger.Debugf("===============offlineList %s", utils.Format4Output(offlineList, false))
-	globals.SugarLogger.Debugf("===============offlineList %s", utils.Format4Output(offlineList, false))
+	//globals.SugarLogger.Debugf("==============createList=%s", utils.Format4Output(createList, false))
+	//globals.SugarLogger.Debugf("===============updateList%s", utils.Format4Output(updateList, false))
+	//globals.SugarLogger.Debugf("==============deleteList=%s", utils.Format4Output(deleteList, false))
+	//globals.SugarLogger.Debugf("===============priceList%s", utils.Format4Output(priceList, false))
+	//globals.SugarLogger.Debugf("===============stockList%s", utils.Format4Output(stockList, false))
+	//globals.SugarLogger.Debugf("==============onlineList=%s", utils.Format4Output(onlineList, false))
+	//globals.SugarLogger.Debugf("===============offlineList %s", utils.Format4Output(offlineList, false))
+	//globals.SugarLogger.Debugf("===============offlineList %s", utils.Format4Output(offlineList, false))
 
 	task := tasksch.NewParallelTask("syncStoreSkuNew", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError2), ctx,
 		func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
diff --git a/controllers/cms_sku.go b/controllers/cms_sku.go
index eab5a9792..75d9a33b5 100644
--- a/controllers/cms_sku.go
+++ b/controllers/cms_sku.go
@@ -867,46 +867,44 @@ func (c *SkuController) UpdateTiktokCategory() {
 			if err := dao.GetRows(db, &skuList, sql, param...); err != nil {
 				return nil, "", err
 			}
-			for _, v1 := range data {
-				for _, v := range skuList {
-					count++
-					item := &model.SkuVendorCategoryMap{
-						ModelIDCULD: model.ModelIDCULD{
-							CreatedAt:    time.Now(),
-							UpdatedAt:    time.Now(),
-							DeletedAt:    utils.DefaultTimeValue,
-							LastOperator: "18981810340",
-						},
-						NameID:   v.NameId,
-						VendorID: model.VendorIDDD,
-					}
-
-					item.VendorCategoryID = v1
-					skuVendorCategoryMap := &model.SkuVendorCategoryMap{}
-					if err := dao.GetRow(db, skuVendorCategoryMap, `SELECT * FROM sku_vendor_category_map WHERE name_id = ? AND vendor_id = ? AND deleted_at = ?`, []interface{}{v.NameId, model.VendorIDDD, utils.DefaultTimeValue}); err != nil {
-						globals.SugarLogger.Debugf("====================err3 %s", err)
-					}
-					if skuVendorCategoryMap != nil && skuVendorCategoryMap.ID > 0 {
-						if _, err := dao.UpdateEntity(db, skuVendorCategoryMap, "VendorCategoryID"); err != nil {
-							globals.SugarLogger.Debugf("====================err4 %s", err)
-						}
-					} else {
-						if err := dao.CreateEntity(db, item); err != nil {
-							globals.SugarLogger.Debugf("====================err5 %s", err)
-						}
-					}
-					go func() {
-						hit, err := cms.CurVendorSync.SyncStoresSkus(params.Ctx, nil, 0, db, []int{14}, []int{v.StoreId}, []int{v.Id}, true, false, true)
-						globals.SugarLogger.Debugf("===============hit:%s err: %s", hit, err)
-					}()
+			for _, v := range skuList {
+				count++
+				item := &model.SkuVendorCategoryMap{
+					ModelIDCULD: model.ModelIDCULD{
+						CreatedAt:    time.Now(),
+						UpdatedAt:    time.Now(),
+						DeletedAt:    utils.DefaultTimeValue,
+						LastOperator: "18981810340",
+					},
+					NameID:   v.NameId,
+					VendorID: model.VendorIDDD,
 				}
+
+				item.VendorCategoryID = data[v.DdId]
+				skuVendorCategoryMap := &model.SkuVendorCategoryMap{}
+				if err := dao.GetRow(db, skuVendorCategoryMap, `SELECT * FROM sku_vendor_category_map WHERE name_id = ? AND vendor_id = ? AND deleted_at = ?`, []interface{}{v.NameId, model.VendorIDDD, utils.DefaultTimeValue}); err != nil {
+					globals.SugarLogger.Debugf("====================err3 %s", err)
+				}
+				if skuVendorCategoryMap != nil && skuVendorCategoryMap.ID > 0 {
+					if _, err := dao.UpdateEntity(db, skuVendorCategoryMap, "VendorCategoryID"); err != nil {
+						globals.SugarLogger.Debugf("====================err4 %s", err)
+					}
+				} else {
+					if err := dao.CreateEntity(db, item); err != nil {
+						globals.SugarLogger.Debugf("====================err5 %s", err)
+					}
+				}
+				go func() {
+					time.Sleep(500 * time.Millisecond)
+					hit, err := cms.CurVendorSync.SyncStoresSkus(params.Ctx, nil, 0, db, []int{14}, []int{v.StoreId}, []int{v.Id}, true, false, true)
+					globals.SugarLogger.Debugf("===============hit:%s err: %s", hit, err)
+				}()
+			}
+			if page*pageSize < total {
+				page++
+			} else {
+				break
 			}
-			break
-			//if page*pageSize < total {
-			//	page++
-			//} else {
-			//	break
-			//}
 		}
 		return count, "", nil
 	})