From cc53eedafc594c7a0d6fbc706abdaee802b94026 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Wed, 4 Jan 2023 19:38:30 +0800
Subject: [PATCH] 1

---
 business/jxstore/misc/misc.go                 | 38 ++++++++++++++++---
 business/model/dao/thing_map.go               |  1 -
 .../purchase/tiktok_store/store_sku2_utils.go | 22 +++--------
 3 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index 2b9e95fa3..1ae1bf341 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -252,11 +252,11 @@ func Init() {
 		}, 60*time.Second, 30*time.Minute)
 
 		//  抖音更新门店商品
-		if beego.BConfig.RunMode != "jxgy" {
-			ScheduleTimerFunc("RefreshSyncSkuList", func() {
-				syncStoreSkuTiktok()
-			}, []string{"01:25:00"})
-		}
+		//if beego.BConfig.RunMode != "jxgy" {
+		//	ScheduleTimerFunc("RefreshSyncSkuList", func() {
+		//		syncStoreSkuTiktok()
+		//	}, []string{"01:25:00"})
+		//}
 
 		// 定时任务刷新当前订单的物流信息
 		ScheduleTimerFunc("RefreshMaterialLogistics", func() {
@@ -590,7 +590,33 @@ func syncStoreSkuTiktok() {
 				if beego.BConfig.RunMode != "jxgy" {
 					errList.AddErr(cms.DeleteSkuNameExPrefixOverdue(db))
 					errList.AddErr(cms.SetMultiStoreSkuSyncModifyStatus(db, partner.GetMultiStoreVendorIDs()))
-					_, err = cms.CurVendorSync.SyncStoresSkus2(jxcontext.AdminCtx, nil, 0, db, []int{model.VendorIDDD}, []int{}, false, nil, nil, syncFlag, true, true)
+					var storeList2GD = []int{
+						102533,
+						668619,
+						100336,
+						102014,
+						103089,
+						667212,
+						667510,
+						100328,
+						100524,
+						102046,
+						103190,
+						667149,
+						100334,
+						101995,
+						102563,
+						102039,
+						100329,
+						102465,
+						102417,
+						100517,
+						102377,
+						666761,
+						102592,
+						102057,
+					}
+					_, err = cms.CurVendorSync.SyncStoresSkus2(jxcontext.AdminCtx, nil, 0, db, []int{model.VendorIDDD}, storeList2GD, false, nil, nil, syncFlag, true, true)
 					errList.AddErr(err)
 				}
 			case 1:
diff --git a/business/model/dao/thing_map.go b/business/model/dao/thing_map.go
index 5eba0483d..3c9ec2ca5 100644
--- a/business/model/dao/thing_map.go
+++ b/business/model/dao/thing_map.go
@@ -52,7 +52,6 @@ func UpdateThingMap(thingMap *model.ThingMap) error {
 
 // GetThingToTiktokMapList 抖店获取同步类型
 func GetThingToTiktokMapList(db *DaoDB, vendorId int, thingId int64, vendorOrgCode string) (cats []*model.ThingMap, err error) {
-
 	sql := `
 	SELECT t1.*
 	FROM thing_map t1
diff --git a/business/partner/purchase/tiktok_store/store_sku2_utils.go b/business/partner/purchase/tiktok_store/store_sku2_utils.go
index 7a3e2f28a..4f0ff92f4 100644
--- a/business/partner/purchase/tiktok_store/store_sku2_utils.go
+++ b/business/partner/purchase/tiktok_store/store_sku2_utils.go
@@ -442,28 +442,16 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
 func loadMainProductId(api *tiktokShop.API, storeSku *dao.StoreSkuSyncInfo) *product_detail_response.ProductDetailData {
 	// 这有可能获取的值主商品也有可能是子商品,我们需要的是主商品id和状态
 	var mainOrderDetail = &product_detail_response.ProductDetailData{}
-	mainOrderDetailSkuId, err := api.GetSkuDetailLocalID("", utils.Int2Str(storeSku.SkuID))
-	if err != nil || mainOrderDetailSkuId == nil {
+	if storeSku.VendorMainId == "" {
 		mainOrderDetail.MainProductId = 0
 		return mainOrderDetail
 	}
-	if mainOrderDetailSkuId.MainProductId != 0 { // 查询出来是子商品
-		mainOrderDetail.MainProductId = mainOrderDetailSkuId.MainProductId
-	} else { //  查询出来是主商品
-		mainOrderDetail.MainProductId = mainOrderDetailSkuId.ProductId
+	mainOrderDetailProductId, err := api.GetSkuDetail(utils.Int64ToStr(mainOrderDetail.MainProductId), "")
+	if err != nil || mainOrderDetailProductId == nil {
+		mainOrderDetail.MainProductId = 0
 		return mainOrderDetail
 	}
-
-	if mainOrderDetail.MainProductId != 0 { // 子商品时,获取主商品id和状态
-		mainOrderDetailProductId, err := api.GetSkuDetail(utils.Int64ToStr(mainOrderDetail.MainProductId), "")
-		if err != nil || mainOrderDetailProductId == nil {
-			mainOrderDetail.MainProductId = 0
-			return mainOrderDetail
-		}
-		mainOrderDetail.MainProductId = mainOrderDetailProductId.ProductId
-	} else {
-		mainOrderDetail.MainProductId = mainOrderDetail.ProductId // 主商品
-	}
+	mainOrderDetail.MainProductId = mainOrderDetailProductId.ProductId
 	return mainOrderDetail
 }