From b3621ed88919af0a8eaf7899abd63c62efbdaba2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sun, 9 Oct 2022 18:25:23 +0800 Subject: [PATCH 01/28] 1 --- business/partner/purchase/tiktok_store/store_sku2.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index 4e2d69aa9..9ee756a1b 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -310,7 +310,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI StartSaleType: 0, PickupMethod: "0", StoreId: int64(storeSku.StoreID), - MainProductId: int64(storeSku.NameID), + //MainProductId: int64(storeSku.NameID), } // 获取上传图,商品轮播图 From 2daf0aba42dd8ebcbd72e467777aa879d4c97943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sun, 9 Oct 2022 18:29:18 +0800 Subject: [PATCH 02/28] 1 --- business/partner/purchase/tiktok_store/store_sku2.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index 9ee756a1b..1544f1e2f 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -344,6 +344,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI return nil, err } param.ProductFormatNew = productFormatNew + globals.SugarLogger.Debug("创建=============param", utils.Format4Output(param, false)) // 抖店创建商品 tiktokResult, err := api.CreateStoreCommodity(param) From 91e2f26ce874be683e6cb7e61255d034560367d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sun, 9 Oct 2022 18:39:49 +0800 Subject: [PATCH 03/28] 1 --- business/partner/purchase/tiktok_store/store_sku2_utils.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/partner/purchase/tiktok_store/store_sku2_utils.go b/business/partner/purchase/tiktok_store/store_sku2_utils.go index f2136fbe0..472dd8efe 100644 --- a/business/partner/purchase/tiktok_store/store_sku2_utils.go +++ b/business/partner/purchase/tiktok_store/store_sku2_utils.go @@ -15,6 +15,7 @@ import ( // GetProductFormatNew 获取物品属性 func GetProductFormatNew(categoryLeftId int64, vendorOrgCode string) (string, error) { category, err := getAPI(vendorOrgCode, 0, "").GetCatePropertyV2(categoryLeftId) + globals.SugarLogger.Debug("========productFormatNewDATA==============", utils.Format4Output(category, false)) if err != nil { return "", err } From 1cbf3299386f5cc8ca275d13159d789090b281b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sun, 9 Oct 2022 18:53:03 +0800 Subject: [PATCH 04/28] 1 --- business/partner/purchase/tiktok_store/store_sku2.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index 1544f1e2f..e97e7e40e 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -309,7 +309,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI SellChannel: []int64{0}, StartSaleType: 0, PickupMethod: "0", - StoreId: int64(storeSku.StoreID), + StoreId: utils.Str2Int64(vendorStoreID), //MainProductId: int64(storeSku.NameID), } From 90c0cc8e492141f5c4749665731a47cd66525598 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sun, 9 Oct 2022 19:35:21 +0800 Subject: [PATCH 05/28] =?UTF-8?q?=E9=99=90=E5=94=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchase/tiktok_store/store_sku2.go | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index e97e7e40e..03d76677a 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -1,6 +1,7 @@ package tiktok_store import ( + "errors" "fmt" "git.rosy.net.cn/baseapi/platformapi/mtwmapi" freightTemplate_create_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/freightTemplate_create/request" @@ -8,7 +9,9 @@ import ( product_detail_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/product_detail/response" product_editV2_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/product_editV2/request" shop_bindStoreFreight_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_bindStoreFreight/request" + shop_bindStoreSaleLimit_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_bindStoreSaleLimit/request" sku_editPrice_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/sku_editPrice/request" + trade_createTradeLimitTemplate_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/trade_createTradeLimitTemplate/request" tiktokShop "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api" "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxutils" @@ -346,6 +349,12 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI param.ProductFormatNew = productFormatNew globals.SugarLogger.Debug("创建=============param", utils.Format4Output(param, false)) + // 获取门店限售模板 + saleLimitId, err := CreateSaleTemp(param.StoreId, api) + if err != nil { + return nil, err + } + param.SaleLimitId = saleLimitId // 抖店创建商品 tiktokResult, err := api.CreateStoreCommodity(param) if err != nil { @@ -428,6 +437,57 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI return failedList, err } +// CreateSaleTemp 创建限售模板 +func CreateSaleTemp(storeId int64, api *tiktokShop.API) (int64, error) { + // 获取限售模板 + saleLimitId, err := api.StoreQuerySaleLimitTemp(storeId) + if err != nil { + return 0, err + } + if saleLimitId != 0 { + return saleLimitId, nil + } + + // 创建限售模板 + param := &trade_createTradeLimitTemplate_request.TradeCreateTradeLimitTemplateParam{ + StoreId: storeId, + TradeLimitRuleRequestList: []trade_createTradeLimitTemplate_request.TradeLimitRuleRequestListItem{}, + } + param.StoreId = storeId + tradeLimitRuleRequestList := make([]trade_createTradeLimitTemplate_request.TradeLimitRuleRequestListItem, 0) + tradeLimitRuleRequest := trade_createTradeLimitTemplate_request.TradeLimitRuleRequestListItem{ + TradeLimitModel: 1, // 限购模型 1-重量，2-数量，3-地区，4-金额 + TradeLimitResource: 2, // 限购资源类别1-抖店，2-门店，3-商品ID，4-sku,5-类目，6-活动，7-商品标 + TradeLimitResourceObject: nil, + TradeLimitPattern: &trade_createTradeLimitTemplate_request.TradeLimitPattern{ + Minimum: 1, // 1毫克 + Maximum: 500 * 1000 * 1000, //500千克 + CumulativeMax: 99999, + }, + TimePeriod: nil, + TradeLimitSubjectList: []int32{1}, + } + tradeLimitRuleRequestList = append(tradeLimitRuleRequestList, tradeLimitRuleRequest) + result, err := api.CreateTradeLimitTemplate(param) + if err != nil { + return 0, err + } + + if result.TradeLimitId == 0 { + return 0, errors.New("限售模板创建错误,联系管理员") + } + + // 绑定限售模板 + if err := api.BindStoreSaleLimit(&shop_bindStoreSaleLimit_request.ShopBindStoreSaleLimitParam{ + StoreId: storeId, + SaleLimitId: result.TradeLimitId, + }); err != nil { + return 0, err + } + + return result.TradeLimitId, nil +} + func (p *PurchaseHandler) DeleteStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) { if globals.EnableDdStoreWrite { for _, v := range storeSkuList { From 701c52cd2af3fe346c5c85115c316251f26620e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sun, 9 Oct 2022 19:37:17 +0800 Subject: [PATCH 06/28] 1 --- business/partner/purchase/tiktok_store/store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index e662f92fc..58aacb3ad 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -422,7 +422,7 @@ func (P *PurchaseHandler) BindStoreSaleLimit(storeID, saleLimitTemplateID int64) StoreId: storeID, SaleLimitId: saleLimitTemplateID, } - if _, err := getAPI("", 0, utils.Int64ToStr(info.StoreId)).BindStoreSaleLimit(info); err != nil { + if err := getAPI("", 0, utils.Int64ToStr(info.StoreId)).BindStoreSaleLimit(info); err != nil { return err } return nil From 2511ccf3c506af821a35d031c2550ca56fcd56a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sun, 9 Oct 2022 19:50:41 +0800 Subject: [PATCH 07/28] 1 --- business/partner/purchase/tiktok_store/store_sku2.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index 03d76677a..050d510d3 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -351,6 +351,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI // 获取门店限售模板 saleLimitId, err := CreateSaleTemp(param.StoreId, api) + globals.SugarLogger.Debug("==22213123131231231", saleLimitId) if err != nil { return nil, err } From df60712410af06f7c0272a76705f9a7491b272ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sun, 9 Oct 2022 19:57:20 +0800 Subject: [PATCH 08/28] 1 --- business/partner/purchase/tiktok_store/store_sku2.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index 050d510d3..5726e7a34 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -442,7 +442,9 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI func CreateSaleTemp(storeId int64, api *tiktokShop.API) (int64, error) { // 获取限售模板 saleLimitId, err := api.StoreQuerySaleLimitTemp(storeId) + globals.SugarLogger.Debug("==========saleLimitId1", saleLimitId) if err != nil { + globals.SugarLogger.Debug("==========saleLimitId2", err) return 0, err } if saleLimitId != 0 { @@ -470,6 +472,8 @@ func CreateSaleTemp(storeId int64, api *tiktokShop.API) (int64, error) { } tradeLimitRuleRequestList = append(tradeLimitRuleRequestList, tradeLimitRuleRequest) result, err := api.CreateTradeLimitTemplate(param) + globals.SugarLogger.Debug("==========err2222", err) + globals.SugarLogger.Debug("==========result222", utils.Format4Output(result, false)) if err != nil { return 0, err } @@ -483,6 +487,7 @@ func CreateSaleTemp(storeId int64, api *tiktokShop.API) (int64, error) { StoreId: storeId, SaleLimitId: result.TradeLimitId, }); err != nil { + globals.SugarLogger.Debug("==========BindStoreSaleLimit", err) return 0, err } From 58a51a19ab24a554fe9ab4521dd1d03176ad67a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sun, 9 Oct 2022 19:59:36 +0800 Subject: [PATCH 09/28] 1 --- business/partner/purchase/tiktok_store/store_sku2.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index 5726e7a34..2ee934606 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -441,12 +441,8 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI // CreateSaleTemp 创建限售模板 func CreateSaleTemp(storeId int64, api *tiktokShop.API) (int64, error) { // 获取限售模板 - saleLimitId, err := api.StoreQuerySaleLimitTemp(storeId) + saleLimitId, _ := api.StoreQuerySaleLimitTemp(storeId) globals.SugarLogger.Debug("==========saleLimitId1", saleLimitId) - if err != nil { - globals.SugarLogger.Debug("==========saleLimitId2", err) - return 0, err - } if saleLimitId != 0 { return saleLimitId, nil } From ed794eeed916cf6b636406993950620a4aaf53a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sun, 9 Oct 2022 20:01:14 +0800 Subject: [PATCH 10/28] 1 --- business/partner/purchase/tiktok_store/store_sku2.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index 2ee934606..e7db1d747 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -313,7 +313,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI StartSaleType: 0, PickupMethod: "0", StoreId: utils.Str2Int64(vendorStoreID), - //MainProductId: int64(storeSku.NameID), + MainProductId: int64(storeSku.NameID), } // 获取上传图,商品轮播图 From a92b7635fbfbe3d4d70b0fadd6c6201d8528b4e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sun, 9 Oct 2022 20:20:20 +0800 Subject: [PATCH 11/28] | --- business/partner/purchase/tiktok_store/store_sku2.go | 4 ++-- .../partner/purchase/tiktok_store/store_sku2_utils.go | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index e7db1d747..c1b3237fa 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -338,7 +338,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI } // spec_prices - param.SpecPrices = GetSpecPrices(param.Specs, storeSku) + param.SpecPrices = GetSpecPrices(param.Specs, vendorStoreID, storeSku) // ProductFormatNew productFormatNew, err := GetProductFormatNew(param.CategoryLeafId, storeDetail.VendorOrgCode) globals.SugarLogger.Debug("创建=============productFormatNew", productFormatNew) @@ -412,7 +412,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI } // spec_prices - param.SpecPrices = GetSpecPrices(param.Specs, storeSku) + param.SpecPrices = GetSpecPrices(param.Specs, vendorStoreID, storeSku) // ProductFormatNew productFormatNew, err := GetProductFormatNew(param.CategoryLeafId, storeDetail.VendorOrgCode) globals.SugarLogger.Debug("更新=============productFormatNew", productFormatNew) diff --git a/business/partner/purchase/tiktok_store/store_sku2_utils.go b/business/partner/purchase/tiktok_store/store_sku2_utils.go index 472dd8efe..73938862f 100644 --- a/business/partner/purchase/tiktok_store/store_sku2_utils.go +++ b/business/partner/purchase/tiktok_store/store_sku2_utils.go @@ -68,7 +68,7 @@ func GetTiktokImgList(storeId, appOrgCode string, img ...string) (string, error) } // GetSpecPrices 解析属性和规格参数 -func GetSpecPrices(specs string, localSku *dao.StoreSkuSyncInfo) string { +func GetSpecPrices(specs, storeId string, localSku *dao.StoreSkuSyncInfo) string { skuSize := make([]*tiktokShop.SpecDetailList, 0, 0) detail1 := strings.Split(specs, "^") if len(detail1) > 3 { @@ -89,6 +89,8 @@ func GetSpecPrices(specs string, localSku *dao.StoreSkuSyncInfo) string { DeliveryInfos: []*tiktokShop.DeliveryInfos{ {InfoType: "weight", InfoUnit: localSku.SpecUnit, InfoValue: fmt.Sprintf("%f", localSku.SpecQuality)}, }, + SkuType: 1, + StockNumMap: map[string]int64{storeId: 999999}, } skuSize = append(skuSize, sku) } @@ -109,6 +111,8 @@ func GetSpecPrices(specs string, localSku *dao.StoreSkuSyncInfo) string { DeliveryInfos: []*tiktokShop.DeliveryInfos{ {InfoType: "weight", InfoUnit: localSku.SpecUnit, InfoValue: fmt.Sprintf("%f", localSku.SpecQuality)}, }, + SkuType: 1, + StockNumMap: map[string]int64{storeId: 999999}, } skuSize = append(skuSize, sku) } @@ -133,6 +137,8 @@ func GetSpecPrices(specs string, localSku *dao.StoreSkuSyncInfo) string { DeliveryInfos: []*tiktokShop.DeliveryInfos{ {InfoType: "weight", InfoUnit: localSku.SpecUnit, InfoValue: fmt.Sprintf("%f", localSku.SpecQuality)}, }, + SkuType: 1, + StockNumMap: map[string]int64{storeId: 999999}, // 最大库存数 } skuSize = append(skuSize, sku) } From 332525033033f2a22a8160dd26f74da8a001541c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sun, 9 Oct 2022 21:31:27 +0800 Subject: [PATCH 12/28] 1 --- .../purchase/tiktok_store/store_sku2.go | 22 +++++++++---- .../purchase/tiktok_store/store_sku2_utils.go | 32 +++++++++++++------ 2 files changed, 37 insertions(+), 17 deletions(-) diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index c1b3237fa..ac1be4602 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -294,13 +294,12 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI if isCreate { syncType = "创建商品" for _, storeSku := range storeSkuList { - // 创建商品 + // 创建子商品 param := &product_addV2_request.ProductAddV2Param{ CategoryLeafId: utils.Str2Int64(storeSku.SkuVendorMapCatID), Name: storeSku.Name, PayType: tiktokShop.TiktokPayType1, ReduceType: tiktokShop.SkuReduceTypePayMakeOrder, - FreightId: freightId, Weight: utils.Int2Float64(storeSku.Weight), DeliveryDelayDay: tiktokShop.DeliveryDelayDayToDay, PresellType: tiktokShop.SendGoodsTypeNow, @@ -313,7 +312,6 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI StartSaleType: 0, PickupMethod: "0", StoreId: utils.Str2Int64(vendorStoreID), - MainProductId: int64(storeSku.NameID), } // 获取上传图,商品轮播图 @@ -338,7 +336,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI } // spec_prices - param.SpecPrices = GetSpecPrices(param.Specs, vendorStoreID, storeSku) + param.SpecPrices = GetSpecPrices(param.Specs, vendorStoreID, 0, storeSku) // ProductFormatNew productFormatNew, err := GetProductFormatNew(param.CategoryLeafId, storeDetail.VendorOrgCode) globals.SugarLogger.Debug("创建=============productFormatNew", productFormatNew) @@ -349,6 +347,16 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI param.ProductFormatNew = productFormatNew globals.SugarLogger.Debug("创建=============param", utils.Format4Output(param, false)) + tiktokResult, err := api.CreateStoreCommodity(param) // 创建主商品 + if err != nil { + failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDDD], syncType) + storeSku.VendorSkuID = utils.Int2Str(storeSku.SkuID) + continue + } + + // 创建子商品 + param.FreightId = freightId + param.SpecPrices = GetSpecPrices(param.Specs, vendorStoreID, tiktokResult.ProductId, storeSku) // 获取门店限售模板 saleLimitId, err := CreateSaleTemp(param.StoreId, api) globals.SugarLogger.Debug("==22213123131231231", saleLimitId) @@ -357,13 +365,13 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI } param.SaleLimitId = saleLimitId // 抖店创建商品 - tiktokResult, err := api.CreateStoreCommodity(param) + tiktokResultChildren, err := api.CreateStoreCommodity(param) if err != nil { failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDDD], syncType) storeSku.VendorSkuID = utils.Int2Str(storeSku.SkuID) continue } - storeSku.VendorSkuID = utils.Int64ToStr(tiktokResult.ProductId) + storeSku.VendorSkuID = utils.Int64ToStr(tiktokResultChildren.ProductId) } } else { syncType = "更新商品" @@ -412,7 +420,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI } // spec_prices - param.SpecPrices = GetSpecPrices(param.Specs, vendorStoreID, storeSku) + param.SpecPrices = GetSpecPrices(param.Specs, vendorStoreID, 0, storeSku) // ProductFormatNew productFormatNew, err := GetProductFormatNew(param.CategoryLeafId, storeDetail.VendorOrgCode) globals.SugarLogger.Debug("更新=============productFormatNew", productFormatNew) diff --git a/business/partner/purchase/tiktok_store/store_sku2_utils.go b/business/partner/purchase/tiktok_store/store_sku2_utils.go index 73938862f..9b15220b9 100644 --- a/business/partner/purchase/tiktok_store/store_sku2_utils.go +++ b/business/partner/purchase/tiktok_store/store_sku2_utils.go @@ -68,7 +68,7 @@ func GetTiktokImgList(storeId, appOrgCode string, img ...string) (string, error) } // GetSpecPrices 解析属性和规格参数 -func GetSpecPrices(specs, storeId string, localSku *dao.StoreSkuSyncInfo) string { +func GetSpecPrices(specs, storeId string, mainSkuId int64, localSku *dao.StoreSkuSyncInfo) string { skuSize := make([]*tiktokShop.SpecDetailList, 0, 0) detail1 := strings.Split(specs, "^") if len(detail1) > 3 { @@ -80,7 +80,6 @@ func GetSpecPrices(specs, storeId string, localSku *dao.StoreSkuSyncInfo) string for i := 0; i < len(name1); i++ { sku := &tiktokShop.SpecDetailList{ SpecDetailName1: name1[i], - StockNum: localSku.Stock, Price: int(localSku.VendorPrice), Code: utils.Int2Str(localSku.SkuID), StepStockNum: 0, @@ -89,8 +88,13 @@ func GetSpecPrices(specs, storeId string, localSku *dao.StoreSkuSyncInfo) string DeliveryInfos: []*tiktokShop.DeliveryInfos{ {InfoType: "weight", InfoUnit: localSku.SpecUnit, InfoValue: fmt.Sprintf("%f", localSku.SpecQuality)}, }, - SkuType: 1, - StockNumMap: map[string]int64{storeId: 999999}, + } + if mainSkuId == 0 { + sku.StockNum = 0 + } else { + sku.StockNum = localSku.Stock + sku.SkuType = 1 + sku.StockNumMap = map[string]int64{storeId: 999999} } skuSize = append(skuSize, sku) } @@ -102,7 +106,6 @@ func GetSpecPrices(specs, storeId string, localSku *dao.StoreSkuSyncInfo) string sku := &tiktokShop.SpecDetailList{ SpecDetailName1: name1[i], SpecDetailName2: name2[j], - StockNum: localSku.Stock, Price: int(localSku.UnitPrice), Code: utils.Int2Str(localSku.SkuID), StepStockNum: 0, @@ -111,8 +114,13 @@ func GetSpecPrices(specs, storeId string, localSku *dao.StoreSkuSyncInfo) string DeliveryInfos: []*tiktokShop.DeliveryInfos{ {InfoType: "weight", InfoUnit: localSku.SpecUnit, InfoValue: fmt.Sprintf("%f", localSku.SpecQuality)}, }, - SkuType: 1, - StockNumMap: map[string]int64{storeId: 999999}, + } + if mainSkuId == 0 { + sku.StockNum = 0 + } else { + sku.StockNum = localSku.Stock + sku.SkuType = 1 + sku.StockNumMap = map[string]int64{storeId: 999999} } skuSize = append(skuSize, sku) } @@ -128,7 +136,6 @@ func GetSpecPrices(specs, storeId string, localSku *dao.StoreSkuSyncInfo) string SpecDetailName1: name1[i], SpecDetailName2: name2[j], SpecDetailName3: name3[k], - StockNum: localSku.Stock, Price: int(localSku.UnitPrice), Code: utils.Int2Str(localSku.SkuID), StepStockNum: 0, @@ -137,8 +144,13 @@ func GetSpecPrices(specs, storeId string, localSku *dao.StoreSkuSyncInfo) string DeliveryInfos: []*tiktokShop.DeliveryInfos{ {InfoType: "weight", InfoUnit: localSku.SpecUnit, InfoValue: fmt.Sprintf("%f", localSku.SpecQuality)}, }, - SkuType: 1, - StockNumMap: map[string]int64{storeId: 999999}, // 最大库存数 + } + if mainSkuId == 0 { + sku.StockNum = 0 + } else { + sku.StockNum = localSku.Stock + sku.SkuType = 1 + sku.StockNumMap = map[string]int64{storeId: 999999} } skuSize = append(skuSize, sku) } From 56f82c548ab3a07f49b9b5507cfd041610105d3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sun, 9 Oct 2022 21:51:33 +0800 Subject: [PATCH 13/28] 1 --- business/partner/purchase/tiktok_store/store_sku2.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index ac1be4602..d84786105 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -260,8 +260,6 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI var syncType string storeDetail, _ := dao.GetStoreDetail(dao.GetDB(), storeID, model.VendorIDDD, "") api := getAPI(storeDetail.VendorOrgCode, storeID, vendorStoreID) - globals.SugarLogger.Debug("=============", storeDetail.VendorOrgCode) - globals.SugarLogger.Debugf("api===============%v", utils.Format4Output(api, false)) freightId, _ := api.GetStoreBindTemp(utils.Str2Int64(vendorStoreID)) if freightId == 0 { // 创建门店运费模板 @@ -311,7 +309,6 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI SellChannel: []int64{0}, StartSaleType: 0, PickupMethod: "0", - StoreId: utils.Str2Int64(vendorStoreID), } // 获取上传图,商品轮播图 @@ -364,6 +361,8 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI return nil, err } param.SaleLimitId = saleLimitId + param.StoreId = utils.Str2Int64(vendorStoreID) + // 抖店创建商品 tiktokResultChildren, err := api.CreateStoreCommodity(param) if err != nil { From 5ee341213b4e192524891473237ee0188fd523b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sun, 9 Oct 2022 22:01:35 +0800 Subject: [PATCH 14/28] 1 --- business/partner/purchase/tiktok_store/store_sku2.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index d84786105..d2d93cf00 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -344,6 +344,13 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI param.ProductFormatNew = productFormatNew globals.SugarLogger.Debug("创建=============param", utils.Format4Output(param, false)) + // 获取品牌 + brandID, err := api.GetSkuBrand(param.CategoryLeafId) + if err != nil { + return nil, err + } + param.StandardBrandId = brandID + tiktokResult, err := api.CreateStoreCommodity(param) // 创建主商品 if err != nil { failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDDD], syncType) From c1558e28d0c53b75f5a792c9041a810cf7ac6c1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sun, 9 Oct 2022 22:09:47 +0800 Subject: [PATCH 15/28] 1 --- .../purchase/tiktok_store/store_sku2.go | 39 ++++++++++--------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index d2d93cf00..74e3f18ea 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -357,27 +357,28 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI storeSku.VendorSkuID = utils.Int2Str(storeSku.SkuID) continue } + globals.SugarLogger.Debugf("tiktokResult main ===", utils.Format4Output(tiktokResult, false)) // 创建子商品 - param.FreightId = freightId - param.SpecPrices = GetSpecPrices(param.Specs, vendorStoreID, tiktokResult.ProductId, storeSku) - // 获取门店限售模板 - saleLimitId, err := CreateSaleTemp(param.StoreId, api) - globals.SugarLogger.Debug("==22213123131231231", saleLimitId) - if err != nil { - return nil, err - } - param.SaleLimitId = saleLimitId - param.StoreId = utils.Str2Int64(vendorStoreID) - - // 抖店创建商品 - tiktokResultChildren, err := api.CreateStoreCommodity(param) - if err != nil { - failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDDD], syncType) - storeSku.VendorSkuID = utils.Int2Str(storeSku.SkuID) - continue - } - storeSku.VendorSkuID = utils.Int64ToStr(tiktokResultChildren.ProductId) + //param.FreightId = freightId + //param.SpecPrices = GetSpecPrices(param.Specs, vendorStoreID, tiktokResult.ProductId, storeSku) + //// 获取门店限售模板 + //saleLimitId, err := CreateSaleTemp(param.StoreId, api) + //globals.SugarLogger.Debug("==22213123131231231", saleLimitId) + //if err != nil { + // return nil, err + //} + //param.SaleLimitId = saleLimitId + //param.StoreId = utils.Str2Int64(vendorStoreID) + // + //// 抖店创建商品 + //tiktokResultChildren, err := api.CreateStoreCommodity(param) + //if err != nil { + // failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDDD], syncType) + // storeSku.VendorSkuID = utils.Int2Str(storeSku.SkuID) + // continue + //} + // storeSku.VendorSkuID = utils.Int64ToStr(tiktokResultChildren.ProductId) } } else { syncType = "更新商品" From 79ca2457fad3e5015fffb6131bfd9b8b18a1e5b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sun, 9 Oct 2022 22:12:15 +0800 Subject: [PATCH 16/28] 1 --- business/partner/purchase/tiktok_store/store_sku2.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index 74e3f18ea..1f982d94c 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -310,7 +310,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI StartSaleType: 0, PickupMethod: "0", } - + param.NeedRechargeMode = false // 获取上传图,商品轮播图 img, err := GetTiktokImgList(utils.Int2Str(storeSku.StoreID), storeDetail.VendorOrgCode, storeSku.ImgOrigin, storeSku.Img2, storeSku.Img3, storeSku.Img4, storeSku.Img5) if err != nil { From 98fb685af66be404dff2cb8c5cee902e3521c8dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sun, 9 Oct 2022 22:14:43 +0800 Subject: [PATCH 17/28] 1 --- business/partner/purchase/tiktok_store/store_sku2.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index 1f982d94c..e87e77a16 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -310,7 +310,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI StartSaleType: 0, PickupMethod: "0", } - param.NeedRechargeMode = false + param.AccountTemplateId = "" // 获取上传图,商品轮播图 img, err := GetTiktokImgList(utils.Int2Str(storeSku.StoreID), storeDetail.VendorOrgCode, storeSku.ImgOrigin, storeSku.Img2, storeSku.Img3, storeSku.Img4, storeSku.Img5) if err != nil { From 0a549f735f17b30dc3759cb9201446b604062413 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sun, 9 Oct 2022 22:19:44 +0800 Subject: [PATCH 18/28] 1 --- business/partner/purchase/tiktok_store/store_sku2.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index e87e77a16..d10134b0d 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -310,7 +310,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI StartSaleType: 0, PickupMethod: "0", } - param.AccountTemplateId = "" + // param.AccountTemplateId = "" // 获取上传图,商品轮播图 img, err := GetTiktokImgList(utils.Int2Str(storeSku.StoreID), storeDetail.VendorOrgCode, storeSku.ImgOrigin, storeSku.Img2, storeSku.Img3, storeSku.Img4, storeSku.Img5) if err != nil { From f616bc595983ba2d80a2b44a321ab8f3142052ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sun, 9 Oct 2022 22:33:37 +0800 Subject: [PATCH 19/28] 1 --- business/partner/purchase/tiktok_store/store_sku2.go | 2 +- .../partner/purchase/tiktok_store/store_sku2_utils.go | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index d10134b0d..29977122f 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -334,7 +334,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI // spec_prices param.SpecPrices = GetSpecPrices(param.Specs, vendorStoreID, 0, storeSku) - // ProductFormatNew + // ProductFormatNew 获取商品属性 productFormatNew, err := GetProductFormatNew(param.CategoryLeafId, storeDetail.VendorOrgCode) globals.SugarLogger.Debug("创建=============productFormatNew", productFormatNew) globals.SugarLogger.Debug("创建=============productFormatNew err", err) diff --git a/business/partner/purchase/tiktok_store/store_sku2_utils.go b/business/partner/purchase/tiktok_store/store_sku2_utils.go index 9b15220b9..110a6f6aa 100644 --- a/business/partner/purchase/tiktok_store/store_sku2_utils.go +++ b/business/partner/purchase/tiktok_store/store_sku2_utils.go @@ -12,6 +12,10 @@ import ( "strings" ) +type PropertyObj struct { + PropertyId []*tiktokShop.ProductFormatNewList `json:"property_id"` +} + // GetProductFormatNew 获取物品属性 func GetProductFormatNew(categoryLeftId int64, vendorOrgCode string) (string, error) { category, err := getAPI(vendorOrgCode, 0, "").GetCatePropertyV2(categoryLeftId) @@ -19,7 +23,7 @@ func GetProductFormatNew(categoryLeftId int64, vendorOrgCode string) (string, er if err != nil { return "", err } - format := make(map[string][]*tiktokShop.ProductFormatNewList, 0) + var format PropertyObj for _, v := range category.Data.Data { for _, d := range v.Options { formateNew := &tiktokShop.ProductFormatNewList{ @@ -27,7 +31,7 @@ func GetProductFormatNew(categoryLeftId int64, vendorOrgCode string) (string, er Name: d.Name, DiyType: v.DiyType, } - format[utils.Int64ToStr(v.CategoryId)] = append(format[utils.Int64ToStr(v.CategoryId)], formateNew) + format.PropertyId = append(format.PropertyId, formateNew) } } productFormatNew, err := json.Marshal(format) From 20f5ae10a1fb29f6ff813dde4cd879b3e3be84ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sun, 9 Oct 2022 22:40:26 +0800 Subject: [PATCH 20/28] 1' --- .../partner/purchase/tiktok_store/store_sku2_utils.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/business/partner/purchase/tiktok_store/store_sku2_utils.go b/business/partner/purchase/tiktok_store/store_sku2_utils.go index 110a6f6aa..fecb863de 100644 --- a/business/partner/purchase/tiktok_store/store_sku2_utils.go +++ b/business/partner/purchase/tiktok_store/store_sku2_utils.go @@ -12,10 +12,6 @@ import ( "strings" ) -type PropertyObj struct { - PropertyId []*tiktokShop.ProductFormatNewList `json:"property_id"` -} - // GetProductFormatNew 获取物品属性 func GetProductFormatNew(categoryLeftId int64, vendorOrgCode string) (string, error) { category, err := getAPI(vendorOrgCode, 0, "").GetCatePropertyV2(categoryLeftId) @@ -23,7 +19,7 @@ func GetProductFormatNew(categoryLeftId int64, vendorOrgCode string) (string, er if err != nil { return "", err } - var format PropertyObj + format := make(map[string][]*tiktokShop.ProductFormatNewList, 0) for _, v := range category.Data.Data { for _, d := range v.Options { formateNew := &tiktokShop.ProductFormatNewList{ @@ -31,7 +27,7 @@ func GetProductFormatNew(categoryLeftId int64, vendorOrgCode string) (string, er Name: d.Name, DiyType: v.DiyType, } - format.PropertyId = append(format.PropertyId, formateNew) + format[utils.Int64ToStr(v.PropertyId)] = append(format[utils.Int64ToStr(v.CategoryId)], formateNew) } } productFormatNew, err := json.Marshal(format) From 0c534f6ee09c0bf3909d0d2414fc34b1ae04bd8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sun, 9 Oct 2022 22:42:34 +0800 Subject: [PATCH 21/28] 1 --- .../purchase/tiktok_store/store_sku2.go | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index 29977122f..a81dc5954 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -360,25 +360,25 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI globals.SugarLogger.Debugf("tiktokResult main ===", utils.Format4Output(tiktokResult, false)) // 创建子商品 - //param.FreightId = freightId - //param.SpecPrices = GetSpecPrices(param.Specs, vendorStoreID, tiktokResult.ProductId, storeSku) - //// 获取门店限售模板 - //saleLimitId, err := CreateSaleTemp(param.StoreId, api) - //globals.SugarLogger.Debug("==22213123131231231", saleLimitId) - //if err != nil { - // return nil, err - //} - //param.SaleLimitId = saleLimitId - //param.StoreId = utils.Str2Int64(vendorStoreID) - // - //// 抖店创建商品 - //tiktokResultChildren, err := api.CreateStoreCommodity(param) - //if err != nil { - // failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDDD], syncType) - // storeSku.VendorSkuID = utils.Int2Str(storeSku.SkuID) - // continue - //} - // storeSku.VendorSkuID = utils.Int64ToStr(tiktokResultChildren.ProductId) + param.FreightId = freightId + param.SpecPrices = GetSpecPrices(param.Specs, vendorStoreID, tiktokResult.ProductId, storeSku) + // 获取门店限售模板 + saleLimitId, err := CreateSaleTemp(param.StoreId, api) + globals.SugarLogger.Debug("==22213123131231231", saleLimitId) + if err != nil { + return nil, err + } + param.SaleLimitId = saleLimitId + param.StoreId = utils.Str2Int64(vendorStoreID) + + // 抖店创建商品 + tiktokResultChildren, err := api.CreateStoreCommodity(param) + if err != nil { + failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDDD], syncType) + storeSku.VendorSkuID = utils.Int2Str(storeSku.SkuID) + continue + } + storeSku.VendorSkuID = utils.Int64ToStr(tiktokResultChildren.ProductId) } } else { syncType = "更新商品" From 2bed3b2d315ad3c8255be6613ffea473fca5dc2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sun, 9 Oct 2022 22:45:23 +0800 Subject: [PATCH 22/28] 1 --- business/partner/purchase/tiktok_store/store_sku2.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index a81dc5954..d07a8792d 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -372,6 +372,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI param.StoreId = utils.Str2Int64(vendorStoreID) // 抖店创建商品 + globals.SugarLogger.Debugf("zishangping=============", utils.Format4Output(param, false)) tiktokResultChildren, err := api.CreateStoreCommodity(param) if err != nil { failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDDD], syncType) From 127ea537d15c27a8f16beec7a81e3f171dc1b898 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sun, 9 Oct 2022 22:47:20 +0800 Subject: [PATCH 23/28] 1' --- business/partner/purchase/tiktok_store/store_sku2.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index d07a8792d..9b693695c 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -357,7 +357,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI storeSku.VendorSkuID = utils.Int2Str(storeSku.SkuID) continue } - globals.SugarLogger.Debugf("tiktokResult main ===", utils.Format4Output(tiktokResult, false)) + globals.SugarLogger.Debugf("tiktokResult main ===%s", utils.Format4Output(tiktokResult, false)) // 创建子商品 param.FreightId = freightId @@ -372,7 +372,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI param.StoreId = utils.Str2Int64(vendorStoreID) // 抖店创建商品 - globals.SugarLogger.Debugf("zishangping=============", utils.Format4Output(param, false)) + globals.SugarLogger.Debugf("zishangping=============%s", utils.Format4Output(param, false)) tiktokResultChildren, err := api.CreateStoreCommodity(param) if err != nil { failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDDD], syncType) From 884f817c6848050858a9a6f372ced32dbb6aae7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sun, 9 Oct 2022 22:52:56 +0800 Subject: [PATCH 24/28] 1 --- business/partner/purchase/tiktok_store/store_sku2.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index 9b693695c..8b51b4353 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -257,6 +257,7 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v // 对于多门店平台来说，storeSkuList中只有SkuID与VendorSkuID有意义 // 抖店的商品只管创建,创建接口会返回成功,但是审核的时候不一定成功.当前系统无法判定此商品是否已经创建过了! func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo, isCreate bool) (failedList []*partner.StoreSkuInfoWithErr, err error) { + globals.SugarLogger.Debug("==============vendorStoreID", vendorStoreID) var syncType string storeDetail, _ := dao.GetStoreDetail(dao.GetDB(), storeID, model.VendorIDDD, "") api := getAPI(storeDetail.VendorOrgCode, storeID, vendorStoreID) From 3e9d3909a7fed6c084cda877dbedf173cff008fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sun, 9 Oct 2022 22:57:40 +0800 Subject: [PATCH 25/28] 1 --- business/partner/purchase/tiktok_store/store_sku2.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index 8b51b4353..57ce57d8a 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -364,7 +364,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI param.FreightId = freightId param.SpecPrices = GetSpecPrices(param.Specs, vendorStoreID, tiktokResult.ProductId, storeSku) // 获取门店限售模板 - saleLimitId, err := CreateSaleTemp(param.StoreId, api) + saleLimitId, err := CreateSaleTemp(utils.Str2Int64(vendorStoreID), api) globals.SugarLogger.Debug("==22213123131231231", saleLimitId) if err != nil { return nil, err @@ -469,7 +469,6 @@ func CreateSaleTemp(storeId int64, api *tiktokShop.API) (int64, error) { StoreId: storeId, TradeLimitRuleRequestList: []trade_createTradeLimitTemplate_request.TradeLimitRuleRequestListItem{}, } - param.StoreId = storeId tradeLimitRuleRequestList := make([]trade_createTradeLimitTemplate_request.TradeLimitRuleRequestListItem, 0) tradeLimitRuleRequest := trade_createTradeLimitTemplate_request.TradeLimitRuleRequestListItem{ TradeLimitModel: 1, // 限购模型 1-重量，2-数量，3-地区，4-金额 From 7f8d7c0ff339d4d6ecef2f2e387ba6a261f19e77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sun, 9 Oct 2022 23:00:00 +0800 Subject: [PATCH 26/28] 1 --- business/partner/purchase/tiktok_store/store_sku2.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index 57ce57d8a..68ae7a11a 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -362,6 +362,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI // 创建子商品 param.FreightId = freightId + param.MainProductId = tiktokResult.ProductId param.SpecPrices = GetSpecPrices(param.Specs, vendorStoreID, tiktokResult.ProductId, storeSku) // 获取门店限售模板 saleLimitId, err := CreateSaleTemp(utils.Str2Int64(vendorStoreID), api) From 9938844bf7469db4a9102f0d07703faefff8ee99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 10 Oct 2022 09:15:51 +0800 Subject: [PATCH 27/28] 1 --- business/partner/purchase/tiktok_store/store_sku2.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index 68ae7a11a..122ddb0e3 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -372,7 +372,8 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI } param.SaleLimitId = saleLimitId param.StoreId = utils.Str2Int64(vendorStoreID) - + param.SkuType = 1 + param.StockNumMap = map[string]int64{vendorStoreID: 999999} // 抖店创建商品 globals.SugarLogger.Debugf("zishangping=============%s", utils.Format4Output(param, false)) tiktokResultChildren, err := api.CreateStoreCommodity(param) From 0b6a377ee0396a9df4b8e4f1b1a1712df26871c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 10 Oct 2022 09:25:04 +0800 Subject: [PATCH 28/28] 1 --- business/partner/purchase/tiktok_store/store_sku2.go | 2 -- .../purchase/tiktok_store/store_sku2_utils.go | 12 ++++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index 122ddb0e3..ae1125667 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -372,8 +372,6 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI } param.SaleLimitId = saleLimitId param.StoreId = utils.Str2Int64(vendorStoreID) - param.SkuType = 1 - param.StockNumMap = map[string]int64{vendorStoreID: 999999} // 抖店创建商品 globals.SugarLogger.Debugf("zishangping=============%s", utils.Format4Output(param, false)) tiktokResultChildren, err := api.CreateStoreCommodity(param) diff --git a/business/partner/purchase/tiktok_store/store_sku2_utils.go b/business/partner/purchase/tiktok_store/store_sku2_utils.go index fecb863de..023ef0f5e 100644 --- a/business/partner/purchase/tiktok_store/store_sku2_utils.go +++ b/business/partner/purchase/tiktok_store/store_sku2_utils.go @@ -92,9 +92,9 @@ func GetSpecPrices(specs, storeId string, mainSkuId int64, localSku *dao.StoreSk if mainSkuId == 0 { sku.StockNum = 0 } else { - sku.StockNum = localSku.Stock + sku.StockNum = 0 sku.SkuType = 1 - sku.StockNumMap = map[string]int64{storeId: 999999} + sku.StockNumMap = map[string]int64{storeId: int64(localSku.Stock)} } skuSize = append(skuSize, sku) } @@ -118,9 +118,9 @@ func GetSpecPrices(specs, storeId string, mainSkuId int64, localSku *dao.StoreSk if mainSkuId == 0 { sku.StockNum = 0 } else { - sku.StockNum = localSku.Stock + sku.StockNum = 0 sku.SkuType = 1 - sku.StockNumMap = map[string]int64{storeId: 999999} + sku.StockNumMap = map[string]int64{storeId: int64(localSku.Stock)} } skuSize = append(skuSize, sku) } @@ -148,9 +148,9 @@ func GetSpecPrices(specs, storeId string, mainSkuId int64, localSku *dao.StoreSk if mainSkuId == 0 { sku.StockNum = 0 } else { - sku.StockNum = localSku.Stock + sku.StockNum = 0 sku.SkuType = 1 - sku.StockNumMap = map[string]int64{storeId: 999999} + sku.StockNumMap = map[string]int64{storeId: int64(localSku.Stock)} } skuSize = append(skuSize, sku) }