From fd78d2e5665a2defd3dc37deaa4bf1fbc1f442d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 27 Oct 2022 20:58:01 +0800 Subject: [PATCH] 1 --- .../purchase/tiktok_store/store_sku2.go | 39 +++++++++---------- .../purchase/tiktok_store/store_sku2_utils.go | 8 +++- 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index 76af65910..8e67d6fcf 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -2,7 +2,6 @@ package tiktok_store import ( "git.rosy.net.cn/baseapi/platformapi/mtwmapi" - product_editV2_commit_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/product_editV2_commit/request" sku_editPrice_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/sku_editPrice/request" sku_syncStock_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/sku_syncStock/request" tiktokShop "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api" @@ -214,30 +213,30 @@ func (p *PurchaseHandler) DeleteStoreSkus(ctx *jxcontext.Context, storeID int, v // UpdateStoreSkusStatus 批量更新商品上下架(上架商品库存更新最大,下架商品库存为0) func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo, status int) (failedList []*partner.StoreSkuInfoWithErr, err error) { api := getAPI(vendorOrgCode, storeID, vendorStoreID) - if status == model.SkuStatusNormal { // 上架 + if status == model.SkuStatusNormal { // 下架 for _, v := range storeSkuList { - if err := api.EditStoreCommodityCommit(&product_editV2_commit_request.ProductEditV2Param2{ - ProductId: utils.Str2Int64(v.VendorSkuID), - Commit: true, - }); err != nil { - failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "上架商品异常")...) - } else { - failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "上架商品正常")...) - } + //if err := api.EditStoreCommodityCommit(&product_editV2_commit_request.ProductEditV2Param2{ + // ProductId: utils.Str2Int64(v.VendorSkuID), + // Commit: true, + //}); err != nil { + // failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "下架商品异常")...) + //} else { + // failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "下架商品正常")...) + //} if err := api.UpdateSkuStock(&sku_syncStock_request.SkuSyncStockParam{ - SkuId: utils.Str2Int64(v.VendorSkuAttrId), - ProductId: utils.Str2Int64(v.VendorSkuID), + SkuId: utils.Str2Int64(v.VendorSkuID), + ProductId: utils.Str2Int64(v.VendorMainId), Incremental: false, IdempotentId: "", - StockNum: 9999, + StockNum: 0, OutWarehouseId: vendorStoreID, }); err != nil { - failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "上架商品异常,添加固定库存")...) + failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "下架商品异常,添加固定库存")...) } else { - failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "上架商品正常,添加固定库存")...) + failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "下架商品正常,添加固定库存")...) } } - } else { // 下架 + } else { // 上架 for _, v := range storeSkuList { //err := api.ProductSetOffline(utils.Str2Int64(v.VendorSkuID)) //if err == nil { @@ -246,14 +245,14 @@ func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, vendorOr // failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "下架商品异常")...) //} if err := api.UpdateSkuStock(&sku_syncStock_request.SkuSyncStockParam{ - SkuId: utils.Str2Int64(v.VendorSkuAttrId), - ProductId: utils.Str2Int64(v.VendorSkuID), + SkuId: utils.Str2Int64(v.VendorSkuID), + ProductId: utils.Str2Int64(v.VendorMainId), Incremental: false, IdempotentId: "", - StockNum: 0, + StockNum: 99999, OutWarehouseId: vendorStoreID, }); err != nil { - failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "下架商品异常,库存更新为0")...) + failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "上架商品异常,库存更新为0")...) } else { failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "上架商品正常,库存更新为0")...) } diff --git a/business/partner/purchase/tiktok_store/store_sku2_utils.go b/business/partner/purchase/tiktok_store/store_sku2_utils.go index e2876c871..85216e7ae 100644 --- a/business/partner/purchase/tiktok_store/store_sku2_utils.go +++ b/business/partner/purchase/tiktok_store/store_sku2_utils.go @@ -183,10 +183,13 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI // 根据本地商品id获取线上商品是否存在,存在则只创建子商品 var tiktokResultProductId int64 = 0 // 获取本地存储映射关系 - localThing, _ := dao.GetThingToTiktokMapList(dao.GetDB(), model.VendorIDDD, int64(storeSku.SkuID)) + localThing, err := dao.GetThingToTiktokMapList(dao.GetDB(), model.VendorIDDD, int64(storeSku.SkuID)) + globals.SugarLogger.Debugf("=======localThing :%s", utils.Format4Output(localThing, false)) + globals.SugarLogger.Debugf("localThing=======err :%s", err) if len(localThing) == 0 { // 线上不存在创建 tiktokResult, err := api.CreateStoreCommodity(param) // 创建主商品 if err != nil { + globals.SugarLogger.Debugf("CreateStoreCommodity=======err :%s", err) failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDDD], syncType) storeSku.VendorSkuID = utils.Int2Str(storeSku.SkuID) continue @@ -197,7 +200,8 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI attrId = append(attrId, utils.Int64ToStr(v.SkuId)) } storeSku.VendorSkuAttrId = strings.Join(attrId, ",") // 属性id skuID - dao.CreateThingMap(int64(storeSku.SkuID), utils.Int64ToStr(tiktokResult.ProductId), storeDetail.VendorOrgCode, storeSku.VendorSkuAttrId) + err = dao.CreateThingMap(int64(storeSku.SkuID), utils.Int64ToStr(tiktokResult.ProductId), storeDetail.VendorOrgCode, storeSku.VendorSkuAttrId) + globals.SugarLogger.Debugf("err=============%s", err) } else { storeSku.VendorMainId = localThing[0].VendorThingID storeSku.VendorSkuAttrId = localThing[0].Remark // 属性id skuID