From 9902bf1ed483bcef62c0d3bf15d4f652407c1d98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Tue, 3 Jan 2023 16:17:16 +0800
Subject: [PATCH] 1'

---
 business/partner/purchase/mtwm/store_sku2.go  |  1 -
 .../purchase/tiktok_store/{mtwm.go => dy.go}  |  0
 .../purchase/tiktok_store/store_sku2.go       | 54 +++++++++----------
 .../purchase/tiktok_store/store_sku2_utils.go | 10 ++--
 4 files changed, 28 insertions(+), 37 deletions(-)
 rename business/partner/purchase/tiktok_store/{mtwm.go => dy.go} (100%)

diff --git a/business/partner/purchase/mtwm/store_sku2.go b/business/partner/purchase/mtwm/store_sku2.go
index 8ac303798..f846cb18f 100644
--- a/business/partner/purchase/mtwm/store_sku2.go
+++ b/business/partner/purchase/mtwm/store_sku2.go
@@ -343,7 +343,6 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
 		}
 
 	}
-	globals.SugarLogger.Debugf("foodDataList=======mtwm  %s", utils.Format4Output(foodDataList, false))
 	if globals.EnableMtwmStoreWrite {
 		if len(foodDataList) == 1 {
 			foodDataList[0]["skus"] = string(utils.MustMarshal(foodDataList[0]["skus"]))
diff --git a/business/partner/purchase/tiktok_store/mtwm.go b/business/partner/purchase/tiktok_store/dy.go
similarity index 100%
rename from business/partner/purchase/tiktok_store/mtwm.go
rename to business/partner/purchase/tiktok_store/dy.go
diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go
index 0a602cdb7..72744e168 100644
--- a/business/partner/purchase/tiktok_store/store_sku2.go
+++ b/business/partner/purchase/tiktok_store/store_sku2.go
@@ -130,17 +130,15 @@ func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, vendorOr
 	if status == model.SkuStatusNormal { // 下架
 		for _, v := range storeSkuList {
 			// 子品商品id获取skuId
-			childrenSkuId, failedList := getProductSkuId4UpdateStock(api, v, storeID)
-			if len(failedList) > 0 {
-				continue
-			}
+			//childrenSkuId, failedList := getProductSkuId4UpdateStock(api, v, storeID)
+			//if len(failedList) > 0 {
+			//	continue
+			//}
 			param := &sku_syncStock_request.SkuSyncStockParam{
-				SkuId:          childrenSkuId,
-				ProductId:      utils.Str2Int64(v.VendorSkuID),
-				Incremental:    false,
-				IdempotentId:   "",
-				StockNum:       99999,
-				OutWarehouseId: vendorStoreID,
+				ProductId:   utils.Str2Int64(v.VendorSkuID),
+				Incremental: false,
+				StockNum:    99999,
+				OutSkuId:    int64(v.SkuID),
 			}
 			if err := api.UpdateSkuStock(param); err != nil {
 				failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], fmt.Sprintf("上架商品,库存值最大化.%s", utils.Format4Output(param, false)))...)
@@ -149,18 +147,16 @@ func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, vendorOr
 	} else { // 上架
 		for _, v := range storeSkuList {
 			// 子品商品id获取skuId
-			childrenSkuId, failedList := getProductSkuId4UpdateStock(api, v, storeID)
-			if len(failedList) > 0 {
-				continue
-			}
+			//childrenSkuId, failedList := getProductSkuId4UpdateStock(api, v, storeID)
+			//if len(failedList) > 0 {
+			//	continue
+			//}
 
 			param := &sku_syncStock_request.SkuSyncStockParam{
-				SkuId:          childrenSkuId,
-				ProductId:      utils.Str2Int64(v.VendorSkuID),
-				Incremental:    false,
-				IdempotentId:   "",
-				StockNum:       0,
-				OutWarehouseId: vendorStoreID,
+				ProductId:   utils.Str2Int64(v.VendorSkuID),
+				Incremental: false,
+				StockNum:    0,
+				OutSkuId:    int64(v.SkuID),
 			}
 			if err := api.UpdateSkuStock(param); err != nil {
 				failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], fmt.Sprintf("下架商品,库存值为0失败.%s", utils.Format4Output(param, false)))...)
@@ -203,18 +199,16 @@ func (p *PurchaseHandler) UpdateStoreSkusStock(ctx *jxcontext.Context, vendorOrg
 	tiktokApi := getAPI(storeSkuList[0].VendorOrgCode, storeID, vendorStoreID)
 	for _, v := range storeSkuList {
 		// 子品商品id获取skuId
-		childrenSkuId, failedList := getProductSkuId4UpdateStock(tiktokApi, v, storeID)
-		if len(failedList) > 0 {
-			continue
-		}
+		//childrenSkuId, failedList := getProductSkuId4UpdateStock(tiktokApi, v, storeID)
+		//if len(failedList) > 0 {
+		//	continue
+		//}
 
 		stockNum := &sku_syncStock_request.SkuSyncStockParam{
-			SkuId:          childrenSkuId,
-			ProductId:      utils.Str2Int64(v.VendorSkuID),
-			Incremental:    false,
-			IdempotentId:   "",
-			StockNum:       int64(v.Stock),
-			OutWarehouseId: vendorStoreID,
+			ProductId:   utils.Str2Int64(v.VendorSkuID),
+			Incremental: false,
+			StockNum:    int64(v.Stock),
+			OutSkuId:    int64(v.SkuID),
 		}
 		if stockNum.StockNum == 0 {
 			stockNum.StockNum = 99999
diff --git a/business/partner/purchase/tiktok_store/store_sku2_utils.go b/business/partner/purchase/tiktok_store/store_sku2_utils.go
index 75fb4d89c..1cd2614a3 100644
--- a/business/partner/purchase/tiktok_store/store_sku2_utils.go
+++ b/business/partner/purchase/tiktok_store/store_sku2_utils.go
@@ -529,12 +529,10 @@ func upDateChildrenPriceStockLaunch(api *tiktokShop.API, storeSku *dao.StoreSkuS
 	}
 	// 同步库存
 	paramStock := &sku_syncStock_request.SkuSyncStockParam{
-		SkuId:          skuId,
-		ProductId:      childrenProductId,
-		Incremental:    false,
-		IdempotentId:   "",
-		StockNum:       int64(storeSku.Stock),
-		OutWarehouseId: vendorStoreID,
+		ProductId:   childrenProductId,
+		Incremental: false,
+		StockNum:    int64(storeSku.Stock),
+		OutSkuId:    int64(storeSku.SkuID),
 	}
 	if paramStock.StockNum == 0 {
 		paramStock.StockNum = 99999