From 22649b2eb2c5629b8cdfafa27ff3617b93017193 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sat, 8 Oct 2022 20:18:41 +0800 Subject: [PATCH 01/34] 1 --- business/jxstore/cms/sync.go | 60 +++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go index fc75537ea..46c9e94d1 100644 --- a/business/jxstore/cms/sync.go +++ b/business/jxstore/cms/sync.go @@ -490,35 +490,39 @@ func (v *VendorSync) SyncStoresCategory(ctx *jxcontext.Context, db *dao.DaoDB, v func (v *VendorSync) SyncStoresSkus2(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag int, db *dao.DaoDB, vendorIDs []int, storeIDs []int, syncDisabled bool, skuIDs, excludeSkuIDs []int, setSyncStatus int, isAsync, isContinueWhenError bool) (hint string, err error) { globals.SugarLogger.Debug("SyncStoresSkus2") isManageIt := len(storeIDs) != 1 || len(skuIDs) == 0 || len(skuIDs) > 8 - task, hint, err := v.LoopStoresMap2(ctx, parentTask, db, fmt.Sprintf("同步门店商品信息:%v", storeIDs), isAsync, isManageIt, vendorIDs, storeIDs, false, - func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) { - loopMapInfo := batchItemList[0].(*LoopStoreMapInfo) - if handler := v.GetStoreHandler(loopMapInfo.VendorID); handler != nil { - parallelCount := 5 - if model.MultiStoresVendorMap[loopMapInfo.VendorID] == 1 { - parallelCount = 2 - } - loopStoreTask := tasksch.NewParallelTask(fmt.Sprintf("处理平台%s", model.VendorChineseNames[loopMapInfo.VendorID]), - tasksch.NewParallelConfig().SetParallelCount(parallelCount).SetIsContinueWhenError(isContinueWhenError), ctx, - func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { - storeMap := batchItemList[0].(*model.StoreMap) - globals.SugarLogger.Debug("SyncStoresSkus2===============1") - if syncDisabled || storeMap.Status > model.StoreStatusDisabled { - globals.SugarLogger.Debug("SyncStoresSkus2===============2") - if setSyncStatus != 0 { - dao.SetStoreSkuSyncStatus(db, storeMap.VendorID, []int{storeMap.StoreID}, skuIDs, setSyncStatus) - } - if _, err = SyncStoreSkuNew(ctx, task, causeFlag, storeMap.VendorID, storeMap.StoreID, storeMap.VendorStoreID, storeMap.VendorOrgCode, nil, skuIDs, excludeSkuIDs, false, isContinueWhenError); err != nil { - globals.SugarLogger.Debugf("SyncStoresSkus2 failed2 store:%d failed with error:%v", storeMap.StoreID, err) - } - } - return nil, err - }, loopMapInfo.StoreMapList) - t.AddChild(loopStoreTask).Run() - _, err = loopStoreTask.GetResult(0) + + funcParam := func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) { + globals.SugarLogger.Debug("SyncStoresSkus2===============0") + loopMapInfo := batchItemList[0].(*LoopStoreMapInfo) + if handler := v.GetStoreHandler(loopMapInfo.VendorID); handler != nil { + globals.SugarLogger.Debug("SyncStoresSkus2===============1") + parallelCount := 5 + if model.MultiStoresVendorMap[loopMapInfo.VendorID] == 1 { + parallelCount = 2 } - return nil, partner.AddVendorInfo2Err(err, loopMapInfo.VendorID) - }, isContinueWhenError) + loopStoreTask := tasksch.NewParallelTask(fmt.Sprintf("处理平台%s", model.VendorChineseNames[loopMapInfo.VendorID]), + tasksch.NewParallelConfig().SetParallelCount(parallelCount).SetIsContinueWhenError(isContinueWhenError), ctx, + func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { + storeMap := batchItemList[0].(*model.StoreMap) + globals.SugarLogger.Debug("SyncStoresSkus2===============2") + if syncDisabled || storeMap.Status > model.StoreStatusDisabled { + globals.SugarLogger.Debug("SyncStoresSkus2===============3") + if setSyncStatus != 0 { + dao.SetStoreSkuSyncStatus(db, storeMap.VendorID, []int{storeMap.StoreID}, skuIDs, setSyncStatus) + } + if _, err = SyncStoreSkuNew(ctx, task, causeFlag, storeMap.VendorID, storeMap.StoreID, storeMap.VendorStoreID, storeMap.VendorOrgCode, nil, skuIDs, excludeSkuIDs, false, isContinueWhenError); err != nil { + globals.SugarLogger.Debugf("SyncStoresSkus2 failed2 store:%d failed with error:%v", storeMap.StoreID, err) + } + } + return nil, err + }, loopMapInfo.StoreMapList) + t.AddChild(loopStoreTask).Run() + _, err = loopStoreTask.GetResult(0) + } + return nil, partner.AddVendorInfo2Err(err, loopMapInfo.VendorID) + } + + task, hint, err := v.LoopStoresMap2(ctx, parentTask, db, fmt.Sprintf("同步门店商品信息:%v", storeIDs), isAsync, isManageIt, vendorIDs, storeIDs, false, funcParam, isContinueWhenError) if task != nil { err = makeSyncError(err) } From dc55e6e840300d4e76790e6f74114af33397a890 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sat, 8 Oct 2022 20:25:30 +0800 Subject: [PATCH 02/34] : --- business/jxstore/cms/sku.go | 11 +++++++++++ business/model/sku.go | 1 + 2 files changed, 12 insertions(+) diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index 235640d4e..f939eab8b 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -703,6 +703,9 @@ func GetSkuNames(ctx *jxcontext.Context, keyword string, isBySku, isQueryMidPric if v.VendorID == model.VendorIDJDShop { skuName.JdsCategoryID = v.VendorCategoryID } + if v.VendorID == model.VendorIDDD { + skuName.DdCategoryID = v.VendorCategoryID + } } } var ( @@ -1143,6 +1146,10 @@ func updateOrCreateSkuVendorCategoryMap(db *dao.DaoDB, ctx *jxcontext.Context, n updateOrCreate(model.VendorIDMTWM, nameID, skuNameExt.MtwmCategoryID) flag = true } + if skuNameExt.DdCategoryID != "" { + updateOrCreate(model.VendorIDDD, nameID, skuNameExt.DdCategoryID) + flag = true + } } else { if payload["jdCategoryID"] != nil { updateOrCreate(model.VendorIDJD, nameID, payload["jdCategoryID"].(string)) @@ -1160,6 +1167,10 @@ func updateOrCreateSkuVendorCategoryMap(db *dao.DaoDB, ctx *jxcontext.Context, n updateOrCreate(model.VendorIDMTWM, nameID, payload["mtwmCategoryID"].(string)) flag = true } + if payload["ddCategoryID"] != nil { + updateOrCreate(model.VendorIDDD, nameID, payload["ddCategoryID"].(string)) + flag = true + } } } return flag diff --git a/business/model/sku.go b/business/model/sku.go index a0ecb6e12..4aa14d3bb 100644 --- a/business/model/sku.go +++ b/business/model/sku.go @@ -302,6 +302,7 @@ type SkuNameExt struct { JdsCategoryID string `json:"jdsCategoryID"` EbaiCategoryID string `json:"ebaiCategoryID"` MtwmCategoryID string `json:"mtwmCategoryID"` + DdCategoryID string `json:"ddCategoryID"` } type SkuExinfoMap struct { From 3c28718dcfc94c1a23875bdcce3fcdc3a2ec5a1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sat, 8 Oct 2022 20:36:45 +0800 Subject: [PATCH 03/34] 1 --- business/jxstore/cms/sync.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go index 46c9e94d1..0415093ef 100644 --- a/business/jxstore/cms/sync.go +++ b/business/jxstore/cms/sync.go @@ -695,6 +695,7 @@ func (v *VendorSync) LoopStoresMap2(ctx *jxcontext.Context, parentTask tasksch.I if storeMapList, err = dao.GetStoresMapList2(db, vendorIDs, storeIDs, nil, model.StoreStatusAll, model.StoreIsSyncYes, "", "", "", mustDirty); err != nil { return nil, "", err } + globals.SugarLogger.Debug("===============len(storeMapList)", len(storeMapList)) if len(storeMapList) == 0 { return nil, "", nil } @@ -711,9 +712,13 @@ func (v *VendorSync) LoopStoresMap2(ctx *jxcontext.Context, parentTask tasksch.I } index++ } + globals.SugarLogger.Debug("===============len(storeMapList)1111111111", vendorStoreMap) + if len(loopInfoList) == 1 { + globals.SugarLogger.Debug("===============len(storeMapList)22222") taskName = fmt.Sprintf("%s,处理平台%s", taskName, model.VendorChineseNames[loopInfoList[0].VendorID]) } + globals.SugarLogger.Debug("===============len(storeMapList)3333") task = tasksch.NewParallelTask(taskName, tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, handler, loopInfoList) if isAsync { From bf8b451718dc5de3c6bfa4d44a4f209f59cc1703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sat, 8 Oct 2022 20:52:46 +0800 Subject: [PATCH 04/34] 1 --- business/jxstore/cms/sync_store_sku.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index 48ff59ee1..1483bf7df 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -147,6 +147,8 @@ func SyncStoreCategories(ctx *jxcontext.Context, parentTask tasksch.ITask, vendo if err == nil { if vendorID == model.VendorIDMTWM { refutil.SetObjFieldByName(storeCatMap, idFieldName, catInfo.VendorCatID) + } else if vendorID == model.VendorIDDD { + refutil.SetObjFieldByName(storeCatMap, idFieldName, catInfo.VendorCatID) } else { refutil.SetObjFieldByName(storeCatMap, idFieldName, utils.Str2Int64WithDefault(catInfo.VendorCatID, 0)) } From 6cbaa51172b9669c71332aa422d9198bacf1a1f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sat, 8 Oct 2022 21:00:19 +0800 Subject: [PATCH 05/34] 1 --- business/model/sku.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/model/sku.go b/business/model/sku.go index 4aa14d3bb..ef8fa96a7 100644 --- a/business/model/sku.go +++ b/business/model/sku.go @@ -130,6 +130,7 @@ type SkuCategory struct { JdCategoryID int64 `orm:"column(jd_category_id)" json:"jdCategoryID"` // 这个是指对应的京东商品类别 EbaiCategoryID int64 `orm:"column(ebai_category_id)" json:"ebaiCategoryID"` // 这个是指对应的饿百商品类别 MtwmCategoryID int64 `orm:"column(mtwm_category_id)" json:"mtwmCategoryID"` // 这个是指对应的美团外卖商品类别 + DdCategoryID int64 `orm:"column(dd_category_id)" json:"ddCategoryID"` // 这个是指对应的抖音外卖商品类别 YbCategoryID int64 `orm:"column(yb_category_id)" json:"ybCategoryID"` // 这个是指对应的银豹商品类别 JdsCategoryID int64 `orm:"column(jds_category_id)" json:"jdsCategoryID"` // 这个是指对应的京东商城类别 GoMeiCategoryID int64 `orm:"column(go_mei_category_id)" json:"goMeiCategoryID"` // 这个是指对应的国美商城类别 From 7e1d25e9040aecd79f8dfbf21b7b1342f077f240 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sat, 8 Oct 2022 21:16:57 +0800 Subject: [PATCH 06/34] 1 --- business/jxstore/cms/sync_store_sku.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index 1483bf7df..9ba06db4e 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -670,6 +670,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag switch step { case 0: if len(deleteList) > 0 { + globals.SugarLogger.Debugf("================deleteList%s", utils.Format4Output(deleteList, true)) _, err = putils.FreeBatchStoreSkuInfo("删除门店商品", func(task tasksch.ITask, batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, successCount int, err error) { var failedList []*partner.StoreSkuInfoWithErr if failedList, err = singleStoreHandler.DeleteStoreSkus(ctx, storeID, vendorStoreID, batchedStoreSkuList); err != nil { @@ -695,7 +696,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag case 1: if len(createList) > 0 { _, err = putils.FreeBatchStoreSkuSyncInfo("创建门店商品", func(task tasksch.ITask, batchedStoreSkuList []*dao.StoreSkuSyncInfo) (result interface{}, successCount int, err error) { - globals.SugarLogger.Debug("========================sth err at createlist run ====================") + globals.SugarLogger.Debugf("================createList%s", utils.Format4Output(createList, true)) var failedList []*partner.StoreSkuInfoWithErr if failedList, err = singleStoreHandler.CreateStoreSkus(ctx, storeID, vendorStoreID, batchedStoreSkuList); singleStoreHandler.IsErrSkuExist(err) { if skuNameList, err2 := singleStoreHandler.GetStoreSkusFullInfo(ctx, task, storeID, vendorStoreID, []*partner.StoreSkuInfo{ @@ -741,6 +742,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag } case 2: if len(updateList) > 0 { + globals.SugarLogger.Debugf("================updateList%s", utils.Format4Output(updateList, true)) _, err = putils.FreeBatchStoreSkuSyncInfo("更新门店商品基础信息", func(task tasksch.ITask, batchedStoreSkuList []*dao.StoreSkuSyncInfo) (result interface{}, successCount int, err error) { var failedList []*partner.StoreSkuInfoWithErr failedList, err = singleStoreHandler.UpdateStoreSkus(ctx, storeID, vendorStoreID, batchedStoreSkuList) @@ -758,6 +760,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag case 3: // for k, list := range [][]*partner.StoreSkuInfo{stockList /*, onlineList*/} { if len(stockList) > 0 { + globals.SugarLogger.Debugf("================更新门店商品库存%s", utils.Format4Output(stockList, true)) _, err = putils.FreeBatchStoreSkuInfo("更新门店商品库存", func(task tasksch.ITask, batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, successCount int, err error) { var failedList []*partner.StoreSkuInfoWithErr failedList, err = storeSkuHandler.UpdateStoreSkusStock(ctx, storeDetail.VendorOrgCode, storeID, vendorStoreID, batchedStoreSkuList) @@ -799,6 +802,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag } case 6: if len(priceList) > 0 { + globals.SugarLogger.Debugf("================更新门店商品价格%s", utils.Format4Output(priceList, true)) _, err = putils.FreeBatchStoreSkuInfo("更新门店商品价格", func(task tasksch.ITask, batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, successCount int, err error) { if isNeedHandleAct(causeFlag) { cancelStoreSkuActs(ctx, task, vendorID, storeDetail.VendorOrgCode, storeID, vendorStoreID, batchedStoreSkuList, true) @@ -825,6 +829,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag for vendorCatID := range reorderSkuMap { vendorCatIDs = append(vendorCatIDs, vendorCatID) } + globals.SugarLogger.Debugf("================门店商品排序%s", utils.Format4Output(reorderSkuMap, true)) reorderTask := tasksch.NewParallelTask("门店商品排序", tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError2), ctx, func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { vendorCatID := batchItemList[0].(string) From 3cfec1a910981109bc01a195caf467ed3201f04f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sat, 8 Oct 2022 21:24:55 +0800 Subject: [PATCH 07/34] 1' --- business/jxstore/cms/sync_store_sku.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index 9ba06db4e..1827eb45e 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -662,6 +662,9 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag // api.JdShop2API.SetCookieWithStr(configs[0].Value) // } } + globals.SugarLogger.Debugf("================createList%s", utils.Format4Output(createList, true)) + globals.SugarLogger.Debugf("================deleteList%s", utils.Format4Output(deleteList, true)) + globals.SugarLogger.Debugf("================updateList%s", utils.Format4Output(updateList, true)) task := tasksch.NewParallelTask("syncStoreSkuNew", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError2), ctx, func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { From 4def4fbe7f6f4fe17131c6a14bd511cc67c21ca2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sat, 8 Oct 2022 21:28:33 +0800 Subject: [PATCH 08/34] 1 --- business/jxstore/cms/sync_store_sku.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index 1827eb45e..bbeef17e3 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -665,6 +665,10 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag globals.SugarLogger.Debugf("================createList%s", utils.Format4Output(createList, true)) globals.SugarLogger.Debugf("================deleteList%s", utils.Format4Output(deleteList, true)) globals.SugarLogger.Debugf("================updateList%s", utils.Format4Output(updateList, true)) + globals.SugarLogger.Debugf("================stockList%s", utils.Format4Output(stockList, true)) + globals.SugarLogger.Debugf("================onlineList%s", utils.Format4Output(onlineList, true)) + globals.SugarLogger.Debugf("================offlineList%s", utils.Format4Output(offlineList, true)) + globals.SugarLogger.Debugf("================priceList%s", utils.Format4Output(priceList, true)) task := tasksch.NewParallelTask("syncStoreSkuNew", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError2), ctx, func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { From 5d744733331f01f606be8615cc8829deec339484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sat, 8 Oct 2022 22:12:01 +0800 Subject: [PATCH 09/34] 1 --- business/jxstore/cms/sync_store_sku.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index bbeef17e3..500df956a 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -505,6 +505,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag } else if model.IsSyncStatusNew(sku.SkuSyncStatus) { calVendorPrice4StoreSku(sku, storeDetail.PricePercentagePackObj, int(storeDetail.PricePercentage)) if singleStoreHandler == nil { + globals.SugarLogger.Debug("11111111111111111111111") if dao.IsVendorThingIDEmpty(sku.VendorSkuID) { // todo 多平台商品库没有正常创建，直接跳过 } else { @@ -521,9 +522,9 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag } else { if sku.MergedStatus == model.SkuStatusNormal { if dao.IsVendorThingIDEmpty(sku.VendorCatID) && !strings.Contains(sku.StoreName, model.ExdStoreName) && vendorID != model.VendorIDYB && vendorID != model.VendorIDJDShop { - // globals.SugarLogger.Warnf("syncStoreSkuNew 创建门店:%d商品:%d，但没有平台分类ID", storeID, sku.SkuID) + globals.SugarLogger.Warnf("syncStoreSkuNew 创建门店:%d商品:%d，但没有平台分类ID", storeID, sku.SkuID) } else if dao.IsVendorThingIDEmpty(utils.Int64ToStr(sku.VendorVendorCatID)) && vendorID == model.VendorIDJDShop { - // globals.SugarLogger.Warnf("syncStoreSkuNew 创建门店:%d商品:%d，但没有映射的平台ID", storeID, sku.SkuID) + globals.SugarLogger.Warnf("syncStoreSkuNew 创建门店:%d商品:%d，但没有映射的平台ID", storeID, sku.SkuID) } else { createList = append(createList, sku) } From be61643bd7557683ad0854b8a103ab766fef0306 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sat, 8 Oct 2022 22:19:43 +0800 Subject: [PATCH 10/34] 1 --- business/jxstore/cms/sync_store_sku.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index 500df956a..d563f021a 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -438,8 +438,11 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag var skus []*dao.StoreSkuSyncInfo if isFull { skus, err = dao.GetFullStoreSkus(db, vendorID, storeID) + globals.SugarLogger.Debugf("================isFull%s", utils.Format4Output(skus, true)) + } else { skus, err = dao.GetStoreSkus(db, vendorID, storeID, skuIDs) + globals.SugarLogger.Debugf("================isFull2%s", utils.Format4Output(skus, true)) } if err != nil || len(skus) == 0 { return err @@ -477,6 +480,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag now := jxutils.OperationTime2HourMinuteFormat(time.Now()) var failedList []*partner.StoreSkuInfoWithErr for _, sku := range skus { + globals.SugarLogger.Debugf("================isFull2%s", utils.Format4Output(sku, true)) if !useVendorPriceDirectly && !isSkuLockTimeValid(sku) { sku.VendorPrice = 0 From f903007d64b3edd38509f3b5210353f689667429 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sat, 8 Oct 2022 22:27:00 +0800 Subject: [PATCH 11/34] 1 --- business/jxstore/cms/sync_store_sku.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index d563f021a..e64b9e56c 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -495,6 +495,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag var bareSku *partner.StoreSkuInfo isNeedReorder := false if isStoreSkuSyncNeedDelete(sku) { + globals.SugarLogger.Debug("11111111111111111111111") if !dao.IsVendorThingIDEmpty(sku.VendorSkuID) { bareSku = storeSkuSyncInfo2Bare(sku) if singleStoreHandler == nil { @@ -507,6 +508,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag updateItems = append(updateItems, sku2Update(vendorID, sku, model.SyncFlagDeletedMask)) } } else if model.IsSyncStatusNew(sku.SkuSyncStatus) { + globals.SugarLogger.Debug("222222222222222") calVendorPrice4StoreSku(sku, storeDetail.PricePercentagePackObj, int(storeDetail.PricePercentage)) if singleStoreHandler == nil { globals.SugarLogger.Debug("11111111111111111111111") @@ -524,6 +526,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag } } } else { + globals.SugarLogger.Debug("2222222222222223333333333333333") if sku.MergedStatus == model.SkuStatusNormal { if dao.IsVendorThingIDEmpty(sku.VendorCatID) && !strings.Contains(sku.StoreName, model.ExdStoreName) && vendorID != model.VendorIDYB && vendorID != model.VendorIDJDShop { globals.SugarLogger.Warnf("syncStoreSkuNew 创建门店:%d商品:%d，但没有平台分类ID", storeID, sku.SkuID) @@ -536,7 +539,10 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag } isNeedReorder = true } else { + globals.SugarLogger.Debug("33333333333333333333333") if dao.IsVendorThingIDEmpty(sku.VendorSkuID) && vendorID != model.VendorIDJDShop { + globals.SugarLogger.Debug("3333333333333333333333344444444444444") + // err = fmt.Errorf("门店:%d，修改没有创建的商品:%d", storeID, sku.SkuID) if vendorID != model.VendorIDJDShop || (vendorID == model.VendorIDJDShop && storeID == model.JdShopMainStoreID && sku.StoreSkuStatus != model.SkuStatusDontSale) { err = utils.NewErrorCode(fmt.Sprintf("门店:%d，修改没有创建的商品:%d", storeID, sku.SkuID), "-1", 0) @@ -548,6 +554,8 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag parentTask.AddFailedList(failedList) } } else { + globals.SugarLogger.Debug("3333333333333333333333355555555555") + isAdded2Update := false // 修改商品信息时不改价（以免活动引起的失败），而用单独的改价来改 if (model.IsSyncStatusUpdate(sku.SkuSyncStatus) || (model.IsSyncStatusSeq(sku.SkuSyncStatus) && reorderHandler == nil)) && singleStoreHandler != nil { @@ -563,6 +571,8 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag priceList = append(priceList, bareSku) } if !isAdded2Update { + globals.SugarLogger.Debug("333333333333333333333335555555555566666666666666666") + if model.IsSyncStatusUpdate(sku.SkuSyncStatus) && singleStoreHandler == nil { // 正常就不应该进到这里 // if bareSku == nil { // bareSku = storeSkuSyncInfo2Bare(sku) From 3a1d34d9a243351f1a14a7a1566944dc38fba952 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sat, 8 Oct 2022 22:57:33 +0800 Subject: [PATCH 12/34] 1 --- business/jxstore/cms/sync_store_sku.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index e64b9e56c..23aafe651 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -528,7 +528,9 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag } else { globals.SugarLogger.Debug("2222222222222223333333333333333") if sku.MergedStatus == model.SkuStatusNormal { - if dao.IsVendorThingIDEmpty(sku.VendorCatID) && !strings.Contains(sku.StoreName, model.ExdStoreName) && vendorID != model.VendorIDYB && vendorID != model.VendorIDJDShop { + if vendorID == model.VendorIDDD { + createList = append(createList, sku) + } else if dao.IsVendorThingIDEmpty(sku.VendorCatID) && !strings.Contains(sku.StoreName, model.ExdStoreName) && vendorID != model.VendorIDYB && vendorID != model.VendorIDJDShop { globals.SugarLogger.Warnf("syncStoreSkuNew 创建门店:%d商品:%d，但没有平台分类ID", storeID, sku.SkuID) } else if dao.IsVendorThingIDEmpty(utils.Int64ToStr(sku.VendorVendorCatID)) && vendorID == model.VendorIDJDShop { globals.SugarLogger.Warnf("syncStoreSkuNew 创建门店:%d商品:%d，但没有映射的平台ID", storeID, sku.SkuID) From 01d21455f063197ae63adaa3f67efe52fc4af7ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sat, 8 Oct 2022 23:03:03 +0800 Subject: [PATCH 13/34] 1' --- business/partner/purchase/tiktok_store/store_sku2.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index 504612266..938784d93 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -252,8 +252,10 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v // 抖店的商品只管创建,创建接口会返回成功,但是审核的时候不一定成功.当前系统无法判定此商品是否已经创建过了! func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo, isCreate bool) (failedList []*partner.StoreSkuInfoWithErr, err error) { var syncType string + globals.SugarLogger.Debug("=============11", storeSkuList[0].VendorOrgCode) storeDetail, _ := dao.GetStoreDetail(dao.GetDB(), storeID, model.VendorIDDD, "") - api := getAPI(storeSkuList[0].VendorOrgCode, storeID, vendorStoreID) + globals.SugarLogger.Debug("=============22", storeDetail.VendorOrgCode) + api := getAPI(storeDetail.VendorOrgCode, storeID, vendorStoreID) freightId, err := api.GetStoreFreight(int64(storeID)) if err != nil { return nil, err From 5138aceec920c24ef1f1934c9936b99f5da13a64 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 10:30:29 +0800 Subject: [PATCH 14/34] 1 --- business/model/dao/store.go | 2 + .../purchase/tiktok_store/store_sku2.go | 37 ++++++++++++++++--- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/business/model/dao/store.go b/business/model/dao/store.go index 29b6cb461..0e1e3300d 100644 --- a/business/model/dao/store.go +++ b/business/model/dao/store.go @@ -40,6 +40,7 @@ type StoreDetail struct { DistrictName string `json:"districtName"` CityName string `json:"cityName"` ProvinceName string `json:"provinceName"` //省名 + ProvinceCode int `json:"provinceCode"` //省名 JdCityCode int `json:"jdCityCode"` //京东市code JdCode int `json:"jdCode"` //京东区code JdsCode int `json:"jdsCode"` //京东商城地址代码 @@ -115,6 +116,7 @@ func getStoreDetail(db *DaoDB, storeID, vendorID int, vendorStoreID, vendorOrgCo t3.value price_percentage_pack_str, t4.value freight_deduction_pack_str, province.name province_name, + province.code province_code, district.name district_name, district.jds_code jds_code, district.jd_code jd_code, diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index 938784d93..fc0c2c419 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -3,10 +3,13 @@ package tiktok_store import ( "encoding/json" "fmt" + freightTemplate_create_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/freightTemplate_create/request" product_addV2_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/product_addV2/request" 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" tiktokShop "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api" + "math/rand" "regexp" "strings" @@ -252,14 +255,38 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v // 抖店的商品只管创建,创建接口会返回成功,但是审核的时候不一定成功.当前系统无法判定此商品是否已经创建过了! func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo, isCreate bool) (failedList []*partner.StoreSkuInfoWithErr, err error) { var syncType string - globals.SugarLogger.Debug("=============11", storeSkuList[0].VendorOrgCode) storeDetail, _ := dao.GetStoreDetail(dao.GetDB(), storeID, model.VendorIDDD, "") - globals.SugarLogger.Debug("=============22", storeDetail.VendorOrgCode) api := getAPI(storeDetail.VendorOrgCode, storeID, vendorStoreID) - freightId, err := api.GetStoreFreight(int64(storeID)) - if err != nil { - return nil, err + + freightId, _ := api.GetStoreBindTemp(utils.Str2Int64(vendorStoreID)) + if freightId == 0 { + // 创建门店运费模板 + temp, err := api.FreightTemplateCreate(&freightTemplate_create_request.FreightTemplateCreateParam{ + Template: &freightTemplate_create_request.Template{ + TemplateName: storeDetail.Name + "_" + utils.Int64ToStr(rand.Int63n(int64(storeID))) + "_系统模板", + ProductProvince: int64(storeDetail.ProvinceCode), + ProductCity: int64(storeDetail.CityCode), + CalculateType: 2, + TransferType: 1, // 快递 + RuleType: 1, + FixedAmount: 500, + }, + Columns: nil, + }) + if err != nil { + return nil, err + } + // 绑定门店运费模板 + err = api.BindFreightTemplate(&shop_bindStoreFreight_request.ShopBindStoreFreightParam{ + StoreId: utils.Str2Int64(vendorStoreID), + FreightId: temp.TemplateId, + }) + if err != nil { + return nil, err + } + freightId = temp.TemplateId } + if isCreate { syncType = "创建商品" for _, storeSku := range storeSkuList { From 55a6786ffdcca7e603629d884bce50abc3e42226 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 10:33:35 +0800 Subject: [PATCH 15/34] 1 --- globals/api/api.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/globals/api/api.go b/globals/api/api.go index 8f8c2e952..a56aa121d 100644 --- a/globals/api/api.go +++ b/globals/api/api.go @@ -294,7 +294,7 @@ func Init() { // todo //FnAPI = fnpsapi.New(beego.AppConfig.DefaultString("fnAppID", ""), beego.AppConfig.DefaultString("fnAppSecret", ""), beego.AppConfig.DefaultString("fnMerchantId", ""), beego.AppConfig.DefaultString("fnCode", "")) - FnAPI = fnpsapi.New("", "", "", "") + FnAPI = fnpsapi.New("", "", "", "", "") FeieAPI = feieapi.New(beego.AppConfig.DefaultString("feieUser", ""), beego.AppConfig.DefaultString("feieKey", "")) XiaoWMAPI = xiaowmapi.New(beego.AppConfig.DefaultInt("xiaoWMAppID", 0), beego.AppConfig.DefaultString("xiaoWMAppKey", "")) YilianyunAPI = yilianyunapi.New(beego.AppConfig.DefaultString("yilianyunClientID", ""), beego.AppConfig.DefaultString("yilianyunClientSecret", "")) From 20b1427458740a85052e868383a58d321df28801 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 10:34:06 +0800 Subject: [PATCH 16/34] 1 --- globals/api/api.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/globals/api/api.go b/globals/api/api.go index a56aa121d..8f8c2e952 100644 --- a/globals/api/api.go +++ b/globals/api/api.go @@ -294,7 +294,7 @@ func Init() { // todo //FnAPI = fnpsapi.New(beego.AppConfig.DefaultString("fnAppID", ""), beego.AppConfig.DefaultString("fnAppSecret", ""), beego.AppConfig.DefaultString("fnMerchantId", ""), beego.AppConfig.DefaultString("fnCode", "")) - FnAPI = fnpsapi.New("", "", "", "", "") + FnAPI = fnpsapi.New("", "", "", "") FeieAPI = feieapi.New(beego.AppConfig.DefaultString("feieUser", ""), beego.AppConfig.DefaultString("feieKey", "")) XiaoWMAPI = xiaowmapi.New(beego.AppConfig.DefaultInt("xiaoWMAppID", 0), beego.AppConfig.DefaultString("xiaoWMAppKey", "")) YilianyunAPI = yilianyunapi.New(beego.AppConfig.DefaultString("yilianyunClientID", ""), beego.AppConfig.DefaultString("yilianyunClientSecret", "")) From 10158e8210b50b2957a1b9190ecfdba3c24a737c 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 10:36:36 +0800 Subject: [PATCH 17/34] 1 --- business/partner/purchase/tiktok_store/store.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index bf7f20044..e289ac43b 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -270,9 +270,9 @@ func (P *PurchaseHandler) CreateFreightTemplate(templateInfo freightTemplate_cre StoreId: vendorStoreID, FreightId: resp.TemplateId, } - _, err1 := api.BindFreightTemplate(bindInfo) + err = api.BindFreightTemplate(bindInfo) if err != nil { - return err1 + return err } //并写入数据库 freightInfo := model.FreightTemplate{ @@ -294,7 +294,7 @@ func (P *PurchaseHandler) ShopBindStoreFreight(storeID, freightID int64) error { FreightId: freightID, } api := getAPI("", int(storeID), "") - _, err := api.BindFreightTemplate(param) + err := api.BindFreightTemplate(param) if err != nil { return err } From b5607440d8767cb3e769a8bbe9d35dff7bd64978 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 10:53:21 +0800 Subject: [PATCH 18/34] 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 fc0c2c419..28d69ab78 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -257,7 +257,8 @@ 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 { // 创建门店运费模板 From 92f6cec3853eb77921e3fef77fdae8e245850e8b 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 10:59:20 +0800 Subject: [PATCH 19/34] 1 --- business/model/dao/common.go | 2 ++ globals/api/apimanager/apimanager.go | 2 ++ 2 files changed, 4 insertions(+) diff --git a/business/model/dao/common.go b/business/model/dao/common.go index e3cb5941f..e8fc45a13 100644 --- a/business/model/dao/common.go +++ b/business/model/dao/common.go @@ -3,6 +3,7 @@ package dao import ( "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/model" + "git.rosy.net.cn/jx-callback/globals" ) func GetDataResource(db *DaoDB, hashCode, fullURL string) (dataRes *model.DataResource, err error) { @@ -53,6 +54,7 @@ func GetVendorOrgCode(db *DaoDB, vendorID int, vendorOrgCode, vendorType string) } sql += " ORDER BY comment" err = GetRows(db, &vendorOrgs, sql, sqlParams) + globals.SugarLogger.Debug("===========sql= ", sql) return vendorOrgs, err } diff --git a/globals/api/apimanager/apimanager.go b/globals/api/apimanager/apimanager.go index d743c75e8..b510a6a29 100644 --- a/globals/api/apimanager/apimanager.go +++ b/globals/api/apimanager/apimanager.go @@ -2,6 +2,7 @@ package apimanager import ( "git.rosy.net.cn/baseapi/platformapi/jdapi" + "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/model" @@ -68,6 +69,7 @@ func (a *APIManager) GetAPI(vendorID int, appOrgCode string) (pfAPI interface{}) tiktokApi := api.TiktokStore codes, _ := dao.GetVendorOrgCode(db, vendorID, appOrgCode, "platform") code := codes[0] + globals.SugarLogger.Debugf("code ================%v", utils.Format4Output(code, true)) tiktokApi.SetAccessToken(code.Token) pfAPI = tiktokApi } From cee59e1afb592c718274a25b6df7ba171c3a13fc 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 11:13:07 +0800 Subject: [PATCH 20/34] 1 --- globals/api/apimanager/apimanager.go | 1 + 1 file changed, 1 insertion(+) diff --git a/globals/api/apimanager/apimanager.go b/globals/api/apimanager/apimanager.go index b510a6a29..f71b139e5 100644 --- a/globals/api/apimanager/apimanager.go +++ b/globals/api/apimanager/apimanager.go @@ -72,6 +72,7 @@ func (a *APIManager) GetAPI(vendorID int, appOrgCode string) (pfAPI interface{}) globals.SugarLogger.Debugf("code ================%v", utils.Format4Output(code, true)) tiktokApi.SetAccessToken(code.Token) pfAPI = tiktokApi + globals.SugarLogger.Debugf("pfAPI ================%v", utils.Format4Output(pfAPI, true)) } return pfAPI } From d96324097a78748bcb1bef901d5977c0ca9e7852 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 11:33:28 +0800 Subject: [PATCH 21/34] 1 --- globals/api/apimanager/apimanager.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/globals/api/apimanager/apimanager.go b/globals/api/apimanager/apimanager.go index f71b139e5..f600f8180 100644 --- a/globals/api/apimanager/apimanager.go +++ b/globals/api/apimanager/apimanager.go @@ -68,9 +68,8 @@ func (a *APIManager) GetAPI(vendorID int, appOrgCode string) (pfAPI interface{}) case model.VendorIDDD: tiktokApi := api.TiktokStore codes, _ := dao.GetVendorOrgCode(db, vendorID, appOrgCode, "platform") - code := codes[0] - globals.SugarLogger.Debugf("code ================%v", utils.Format4Output(code, true)) - tiktokApi.SetAccessToken(code.Token) + globals.SugarLogger.Debugf("code ================%v", utils.Format4Output(codes[0], true)) + tiktokApi.SetAccessToken(codes[0].Token) pfAPI = tiktokApi globals.SugarLogger.Debugf("pfAPI ================%v", utils.Format4Output(pfAPI, true)) } From 24b0559c3cba7c842b00db8503003cce64379115 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 11:43:44 +0800 Subject: [PATCH 22/34] 1 --- business/jxstore/cms/store.go | 13 ++++++------- globals/api/apimanager/apimanager.go | 2 ++ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index e663da59a..01e4dc9c0 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -4428,14 +4428,13 @@ func RefreshTiktokShopToken(ctx *jxcontext.Context) (err error) { return } //token是三天,两天刷新一次token - storeMaps, _ := dao.GetStoresMapList(db, []int{model.VendorIDDD}, nil, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", globals.Mtwm2Code) - for _, v := range storeMaps { - if v.MtwmRefreshToken != "" { - api.TiktokStore.SetRefreshToken(v.MtwmRefreshToken) + codes, _ := dao.GetVendorOrgCode(db, model.VendorIDDD, "", "platform") + for _, v := range codes { + if v.Token != "" { if result, err := api.TiktokStore.RefreshToken(); err == nil { - v.MtwmToken = result.AccessToken - v.MtwmRefreshToken = result.RefreshToken - dao.UpdateEntity(db, v, "MtwmToken", "MtwmRefreshToken") + token, _ := json.Marshal(result) + v.Token = string(token) + dao.UpdateEntity(db, v, "token") } } } diff --git a/globals/api/apimanager/apimanager.go b/globals/api/apimanager/apimanager.go index f600f8180..6ae95f1dd 100644 --- a/globals/api/apimanager/apimanager.go +++ b/globals/api/apimanager/apimanager.go @@ -71,6 +71,8 @@ func (a *APIManager) GetAPI(vendorID int, appOrgCode string) (pfAPI interface{}) globals.SugarLogger.Debugf("code ================%v", utils.Format4Output(codes[0], true)) tiktokApi.SetAccessToken(codes[0].Token) pfAPI = tiktokApi + globals.SugarLogger.Debugf("tiktokApi ================%v", utils.Format4Output(tiktokApi, true)) + globals.SugarLogger.Debugf("tiktokApi ================%v", utils.Format4Output(tiktokApi.GetToken(), true)) globals.SugarLogger.Debugf("pfAPI ================%v", utils.Format4Output(pfAPI, true)) } return pfAPI From 9e63844ff12942b9fd84331702016de9f65eb750 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 11:54:42 +0800 Subject: [PATCH 23/34] 1 --- globals/api/apimanager/apimanager.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/globals/api/apimanager/apimanager.go b/globals/api/apimanager/apimanager.go index 6ae95f1dd..66760fd9f 100644 --- a/globals/api/apimanager/apimanager.go +++ b/globals/api/apimanager/apimanager.go @@ -2,6 +2,7 @@ package apimanager import ( "git.rosy.net.cn/baseapi/platformapi/jdapi" + "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api" "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" @@ -10,6 +11,7 @@ import ( "git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" + beego "github.com/astaxie/beego/server/web" ) const ( @@ -66,13 +68,10 @@ func (a *APIManager) GetAPI(vendorID int, appOrgCode string) (pfAPI interface{}) case model.VendorIDTT: pfAPI = api.TiktokApi case model.VendorIDDD: - tiktokApi := api.TiktokStore codes, _ := dao.GetVendorOrgCode(db, vendorID, appOrgCode, "platform") - globals.SugarLogger.Debugf("code ================%v", utils.Format4Output(codes[0], true)) - tiktokApi.SetAccessToken(codes[0].Token) + tiktokApi := tiktok_api.New(beego.AppConfig.DefaultString("tiktokShopAppId", ""), beego.AppConfig.DefaultString("tiktokShopAppSecret", ""), codes[0].Token) pfAPI = tiktokApi globals.SugarLogger.Debugf("tiktokApi ================%v", utils.Format4Output(tiktokApi, true)) - globals.SugarLogger.Debugf("tiktokApi ================%v", utils.Format4Output(tiktokApi.GetToken(), true)) globals.SugarLogger.Debugf("pfAPI ================%v", utils.Format4Output(pfAPI, true)) } return pfAPI From c1234483a1d65d72d254e37d3fdd908405285caf 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 13:38:58 +0800 Subject: [PATCH 24/34] 1 --- globals/api/apimanager/apimanager.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/globals/api/apimanager/apimanager.go b/globals/api/apimanager/apimanager.go index 66760fd9f..c8f55a3da 100644 --- a/globals/api/apimanager/apimanager.go +++ b/globals/api/apimanager/apimanager.go @@ -69,9 +69,7 @@ func (a *APIManager) GetAPI(vendorID int, appOrgCode string) (pfAPI interface{}) pfAPI = api.TiktokApi case model.VendorIDDD: codes, _ := dao.GetVendorOrgCode(db, vendorID, appOrgCode, "platform") - tiktokApi := tiktok_api.New(beego.AppConfig.DefaultString("tiktokShopAppId", ""), beego.AppConfig.DefaultString("tiktokShopAppSecret", ""), codes[0].Token) - pfAPI = tiktokApi - globals.SugarLogger.Debugf("tiktokApi ================%v", utils.Format4Output(tiktokApi, true)) + pfAPI = tiktok_api.New(beego.AppConfig.DefaultString("tiktokShopAppId", ""), beego.AppConfig.DefaultString("tiktokShopAppSecret", ""), codes[0].Token) globals.SugarLogger.Debugf("pfAPI ================%v", utils.Format4Output(pfAPI, true)) } return pfAPI From 8319b15ad67071c5667eae7685aa8a48aa89f7ba 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 14:02:48 +0800 Subject: [PATCH 25/34] 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 28d69ab78..8d7d3d84d 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -265,7 +265,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI temp, err := api.FreightTemplateCreate(&freightTemplate_create_request.FreightTemplateCreateParam{ Template: &freightTemplate_create_request.Template{ TemplateName: storeDetail.Name + "_" + utils.Int64ToStr(rand.Int63n(int64(storeID))) + "_系统模板", - ProductProvince: int64(storeDetail.ProvinceCode), + ProductProvince: utils.Str2Int64(utils.Int2Str(storeDetail.ProvinceCode)[0:2]), ProductCity: int64(storeDetail.CityCode), CalculateType: 2, TransferType: 1, // 快递 From d5414763008186519cbe939ad7b993e08ba142b4 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 14:10:41 +0800 Subject: [PATCH 26/34] 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 8d7d3d84d..11ae2b3af 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -293,7 +293,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI for _, storeSku := range storeSkuList { // 创建商品 param := &product_addV2_request.ProductAddV2Param{ - CategoryLeafId: utils.Str2Int64(storeSku.VendorCatID), + CategoryLeafId: utils.Str2Int64(storeSku.SkuVendorMapCatID), Name: storeSku.Name, PayType: tiktokShop.TiktokPayType1, ReduceType: tiktokShop.SkuReduceTypePayMakeOrder, From 1768c77afaf03a1d3e2b5389855f2f786041d1da 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 14:16:31 +0800 Subject: [PATCH 27/34] 1 --- business/partner/purchase/tiktok_store/store_sku2.go | 8 ++++---- .../partner/purchase/tiktok_store/store_sku2_utils.go | 5 ++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index 11ae2b3af..2bcab9047 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -314,13 +314,13 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI } // 获取上传图,商品轮播图 - img, err := GetTiktokImgList(utils.Int2Str(storeSku.StoreID), storeSku.ImgOrigin, storeSku.Img2, storeSku.Img3, storeSku.Img4, storeSku.Img5) + img, err := GetTiktokImgList(utils.Int2Str(storeSku.StoreID), storeDetail.VendorOrgCode, storeSku.ImgOrigin, storeSku.Img2, storeSku.Img3, storeSku.Img4, storeSku.Img5) if err != nil { return nil, err } param.Pic = img // 商品详情图 - img2, err := GetTiktokImgList(utils.Int2Str(storeSku.StoreID), storeSku.DescImg) + img2, err := GetTiktokImgList(utils.Int2Str(storeSku.StoreID), storeDetail.VendorOrgCode, storeSku.DescImg) if err != nil { return nil, err } @@ -378,13 +378,13 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI } // 获取上传图,商品轮播图 - img, err := GetTiktokImgList(utils.Int2Str(storeSku.StoreID), storeSku.ImgOrigin, storeSku.Img2, storeSku.Img3, storeSku.Img4, storeSku.Img5) + img, err := GetTiktokImgList(utils.Int2Str(storeSku.StoreID), storeDetail.VendorOrgCode, storeSku.ImgOrigin, storeSku.Img2, storeSku.Img3, storeSku.Img4, storeSku.Img5) if err != nil { return nil, err } param.Pic = img // 商品详情图 - img2, err := GetTiktokImgList(utils.Int2Str(storeSku.StoreID), storeSku.DescImg) + img2, err := GetTiktokImgList(utils.Int2Str(storeSku.StoreID), storeDetail.VendorOrgCode, storeSku.DescImg) if err != nil { return nil, err } diff --git a/business/partner/purchase/tiktok_store/store_sku2_utils.go b/business/partner/purchase/tiktok_store/store_sku2_utils.go index 4e2267696..343f23206 100644 --- a/business/partner/purchase/tiktok_store/store_sku2_utils.go +++ b/business/partner/purchase/tiktok_store/store_sku2_utils.go @@ -8,7 +8,6 @@ import ( "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" - "git.rosy.net.cn/jx-callback/globals/api" "strings" ) @@ -37,7 +36,7 @@ func GetProductFormatNew(categoryLeftId int64, vendorOrgCode string) (string, er } // GetTiktokImgList 获取抖音图片链接 -func GetTiktokImgList(storeId string, img ...string) (string, error) { +func GetTiktokImgList(storeId, appOrgCode string, img ...string) (string, error) { imgs := make([]tiktokShop.Imgs, 0, 0) for _, v := range img { if v != "" { @@ -47,7 +46,7 @@ func GetTiktokImgList(storeId string, img ...string) (string, error) { }) } } - tiktokImgList, err := api.TiktokStore.BatchUploadImages(imgs) + tiktokImgList, err := getAPI(appOrgCode, 0, "").BatchUploadImages(imgs) if err != nil { return "", err } From 507e24c9ee5ff747ba81ee2fdf4f9e6966b3e3fb 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 14:45:28 +0800 Subject: [PATCH 28/34] 1 --- business/jxstore/cms/sync_store_sku.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index 23aafe651..ab3681fec 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -788,6 +788,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag _, err = putils.FreeBatchStoreSkuInfo("更新门店商品库存", func(task tasksch.ITask, batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, successCount int, err error) { var failedList []*partner.StoreSkuInfoWithErr failedList, err = storeSkuHandler.UpdateStoreSkusStock(ctx, storeDetail.VendorOrgCode, storeID, vendorStoreID, batchedStoreSkuList) + globals.SugarLogger.Debug("failedList===========", failedList) failedList, err = buildFailedListAndErr(failedList, err, batchedStoreSkuList, nil, storeID, vendorID, "更新门店商品库存") if len(failedList) > 0 { task.AddFailedList(failedList) From 2be8fdc77494dfdefa78b9f68a10705630419039 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 14:48:36 +0800 Subject: [PATCH 29/34] 1 --- business/jxstore/cms/sync_store_sku.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index ab3681fec..30bb731a8 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -788,7 +788,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag _, err = putils.FreeBatchStoreSkuInfo("更新门店商品库存", func(task tasksch.ITask, batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, successCount int, err error) { var failedList []*partner.StoreSkuInfoWithErr failedList, err = storeSkuHandler.UpdateStoreSkusStock(ctx, storeDetail.VendorOrgCode, storeID, vendorStoreID, batchedStoreSkuList) - globals.SugarLogger.Debug("failedList===========", failedList) + globals.SugarLogger.Debugf("failedList===========%s", utils.Format4Output(failedList, true)) failedList, err = buildFailedListAndErr(failedList, err, batchedStoreSkuList, nil, storeID, vendorID, "更新门店商品库存") if len(failedList) > 0 { task.AddFailedList(failedList) From 9c2b64733f52432fb0a629c2b921e7571519431a 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 14:58:15 +0800 Subject: [PATCH 30/34] 1 --- business/partner/purchase/tiktok_store/store_sku2.go | 6 ++++-- business/partner/putils/store_sku.go | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index 2bcab9047..4be7a082e 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -402,6 +402,8 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI param.SpecPrices = GetSpecPrices(param.Specs, storeSku) // ProductFormatNew productFormatNew, err := GetProductFormatNew(param.CategoryLeafId, storeDetail.VendorOrgCode) + globals.SugarLogger.Debug("=============productFormatNew", productFormatNew) + globals.SugarLogger.Debug("=============productFormatNew err", err) if err != nil { return nil, err } @@ -525,9 +527,9 @@ func (p *PurchaseHandler) UpdateStoreSkusPrice(ctx *jxcontext.Context, vendorOrg err := api.EditStoreCommodity(param) if 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], "上架商品异常")...) + } else { + failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "上架商品正常")...) } } diff --git a/business/partner/putils/store_sku.go b/business/partner/putils/store_sku.go index c1405762a..bd1d199ff 100644 --- a/business/partner/putils/store_sku.go +++ b/business/partner/putils/store_sku.go @@ -2,6 +2,7 @@ package putils import ( "fmt" + "git.rosy.net.cn/jx-callback/globals" "sort" "time" @@ -250,6 +251,7 @@ func GetErrMsg2FailedSingleList(storeSkuList interface{}, err error, storeID int errMsg = err.Error() } if storeSkuLists, ok := storeSkuList.([]*partner.StoreSkuInfo); ok { + globals.SugarLogger.Debugf("=======storeSkuLists== %s", utils.Format4Output(storeSkuLists, false)) storeSkuInfoWithErr := &partner.StoreSkuInfoWithErr{ StoreSkuInfo: storeSkuLists[0], ErrMsg: errMsg, @@ -259,6 +261,7 @@ func GetErrMsg2FailedSingleList(storeSkuList interface{}, err error, storeID int } failedList = append(failedList, storeSkuInfoWithErr) } else if storeSkuLists, ok := storeSkuList.([]*dao.StoreSkuSyncInfo); ok { + globals.SugarLogger.Debugf("=======storeSkuLists StoreSkuSyncInfo== %s", utils.Format4Output(storeSkuLists, false)) storeSkuInfo := &partner.StoreSkuInfo{ SkuID: storeSkuLists[0].SkuID, VendorSkuID: storeSkuLists[0].VendorSkuID, @@ -276,6 +279,7 @@ func GetErrMsg2FailedSingleList(storeSkuList interface{}, err error, storeID int } failedList = append(failedList, storeSkuInfoWithErr) } else if storeSku, ok := storeSkuList.(*dao.StoreSkuSyncInfo); ok { + globals.SugarLogger.Debugf("=======storeSku== %s", utils.Format4Output(storeSkuLists, false)) storeSkuInfo := &partner.StoreSkuInfo{ SkuID: storeSku.SkuID, VendorSkuID: storeSku.VendorSkuID, @@ -293,6 +297,7 @@ func GetErrMsg2FailedSingleList(storeSkuList interface{}, err error, storeID int } failedList = append(failedList, storeSkuInfoWithErr) } else { + globals.SugarLogger.Debugf("=======else== %s", utils.Format4Output(storeSkuLists, false)) storeSkuInfoWithErr := &partner.StoreSkuInfoWithErr{ ErrMsg: errMsg, StoreID: storeID, From 5864cf027645222b048364a702b001a1bc5d20d5 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 15:47:46 +0800 Subject: [PATCH 31/34] 1 --- .../purchase/tiktok_store/store_sku2.go | 66 ++++++++++--------- business/partner/putils/store_sku.go | 10 +++ 2 files changed, 46 insertions(+), 30 deletions(-) diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index 4be7a082e..750a74668 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -1,19 +1,15 @@ package tiktok_store import ( - "encoding/json" "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" product_addV2_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/product_addV2/request" 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" + sku_editPrice_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/sku_editPrice/request" tiktokShop "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api" - "math/rand" - "regexp" - "strings" - - "git.rosy.net.cn/baseapi/platformapi/mtwmapi" "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" @@ -23,6 +19,8 @@ import ( "git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/business/partner/putils" "git.rosy.net.cn/jx-callback/globals" + "math/rand" + "regexp" ) const ( @@ -500,32 +498,40 @@ func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, vendorOr func (p *PurchaseHandler) UpdateStoreSkusPrice(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) { api := getAPI(vendorOrgCode, storeID, vendorStoreID) for _, v := range storeSkuList { - param := &product_editV2_request.ProductEditV2Param{} - param.ProductId = utils.Str2Int64(v.VendorSkuID) - param.Specs = "净重|" + fmt.Sprintf("%f", v.SpecQuality) + v.SpecUnit - - skuSize := make([]*tiktokShop.SpecDetailList, 0, 0) - detail1 := strings.Split(param.Specs, "^") - name1 := strings.Split(strings.Split(detail1[0], "|")[1], ",") - for i := 0; i < len(name1); i++ { - sku := &tiktokShop.SpecDetailList{ - SpecDetailName1: name1[i], - StockNum: v.Stock, - Price: int(v.VendorPrice), - Code: utils.Int2Str(v.SkuID), - StepStockNum: 0, - SupplierID: "", - OuterSkuID: utils.Int2Str(v.NameID), - DeliveryInfos: []*tiktokShop.DeliveryInfos{ - {InfoType: "weight", InfoUnit: v.SpecUnit, InfoValue: fmt.Sprintf("%f", v.SpecQuality)}, - }, - } - skuSize = append(skuSize, sku) + //param := &product_editV2_request.ProductEditV2Param{} + //param.ProductId = utils.Str2Int64(v.VendorSkuID) + //param.Specs = "净重|" + fmt.Sprintf("%f", v.SpecQuality) + v.SpecUnit + // + //skuSize := make([]*tiktokShop.SpecDetailList, 0, 0) + //detail1 := strings.Split(param.Specs, "^") + //name1 := strings.Split(strings.Split(detail1[0], "|")[1], ",") + //for i := 0; i < len(name1); i++ { + // sku := &tiktokShop.SpecDetailList{ + // SpecDetailName1: name1[i], + // StockNum: v.Stock, + // Price: int(v.VendorPrice), + // Code: utils.Int2Str(v.SkuID), + // StepStockNum: 0, + // SupplierID: "", + // OuterSkuID: utils.Int2Str(v.NameID), + // DeliveryInfos: []*tiktokShop.DeliveryInfos{ + // {InfoType: "weight", InfoUnit: v.SpecUnit, InfoValue: fmt.Sprintf("%f", v.SpecQuality)}, + // }, + // } + // skuSize = append(skuSize, sku) + //} + //data, _ := json.Marshal(skuSize) + //param.SpecPrices = string(data) + param := &sku_editPrice_request.SkuEditPriceParam{ + Price: v.VendorPrice, + Code: "", + SkuId: 0, + OutSkuId: int64(v.SkuID), + ProductId: utils.Str2Int64(v.VendorSkuID), + OutProductId: int64(v.SkuID), } - data, _ := json.Marshal(skuSize) - param.SpecPrices = string(data) - err := api.EditStoreCommodity(param) + err := api.EditPrice(param) if err != nil { failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "上架商品异常")...) } else { diff --git a/business/partner/putils/store_sku.go b/business/partner/putils/store_sku.go index bd1d199ff..4862088ed 100644 --- a/business/partner/putils/store_sku.go +++ b/business/partner/putils/store_sku.go @@ -260,6 +260,16 @@ func GetErrMsg2FailedSingleList(storeSkuList interface{}, err error, storeID int SyncType: syncType, } failedList = append(failedList, storeSkuInfoWithErr) + } else if storeSku, ok := storeSkuList.(*partner.StoreSkuInfo); ok { + globals.SugarLogger.Debugf("=======storeSku== %s", utils.Format4Output(storeSkuLists, false)) + storeSkuInfoWithErr := &partner.StoreSkuInfoWithErr{ + StoreSkuInfo: storeSku, + ErrMsg: errMsg, + StoreID: storeID, + VendoreName: vendorName, + SyncType: syncType, + } + failedList = append(failedList, storeSkuInfoWithErr) } else if storeSkuLists, ok := storeSkuList.([]*dao.StoreSkuSyncInfo); ok { globals.SugarLogger.Debugf("=======storeSkuLists StoreSkuSyncInfo== %s", utils.Format4Output(storeSkuLists, false)) storeSkuInfo := &partner.StoreSkuInfo{ From 77666b56ccf4b1eecbec7f6968280d4e0b2ca76c 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 15:55:29 +0800 Subject: [PATCH 32/34] 1 --- .../purchase/tiktok_store/store_sku2.go | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index 750a74668..6fabef5f1 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -336,6 +336,8 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI param.SpecPrices = GetSpecPrices(param.Specs, storeSku) // ProductFormatNew productFormatNew, err := GetProductFormatNew(param.CategoryLeafId, storeDetail.VendorOrgCode) + globals.SugarLogger.Debug("创建=============productFormatNew", productFormatNew) + globals.SugarLogger.Debug("创建=============productFormatNew err", err) if err != nil { return nil, err } @@ -400,8 +402,8 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI param.SpecPrices = GetSpecPrices(param.Specs, storeSku) // ProductFormatNew productFormatNew, err := GetProductFormatNew(param.CategoryLeafId, storeDetail.VendorOrgCode) - globals.SugarLogger.Debug("=============productFormatNew", productFormatNew) - globals.SugarLogger.Debug("=============productFormatNew err", err) + globals.SugarLogger.Debug("更新=============productFormatNew", productFormatNew) + globals.SugarLogger.Debug("更新=============productFormatNew err", err) if err != nil { return nil, err } @@ -523,19 +525,19 @@ func (p *PurchaseHandler) UpdateStoreSkusPrice(ctx *jxcontext.Context, vendorOrg //data, _ := json.Marshal(skuSize) //param.SpecPrices = string(data) param := &sku_editPrice_request.SkuEditPriceParam{ - Price: v.VendorPrice, - Code: "", - SkuId: 0, - OutSkuId: int64(v.SkuID), - ProductId: utils.Str2Int64(v.VendorSkuID), - OutProductId: int64(v.SkuID), + Price: v.VendorPrice, + Code: "", + SkuId: 0, + OutSkuId: int64(v.SkuID), + ProductId: utils.Str2Int64(v.VendorSkuID), + //OutProductId: int64(v.SkuID), } err := api.EditPrice(param) if 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], "更新价格正常")...) } } From 8492cf6d64668c6cca0abc2b6ac006d7603bec7d 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 16:07:22 +0800 Subject: [PATCH 33/34] 1 --- business/partner/purchase/tiktok_store/store_sku2_utils.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/business/partner/purchase/tiktok_store/store_sku2_utils.go b/business/partner/purchase/tiktok_store/store_sku2_utils.go index 343f23206..cb036353a 100644 --- a/business/partner/purchase/tiktok_store/store_sku2_utils.go +++ b/business/partner/purchase/tiktok_store/store_sku2_utils.go @@ -8,6 +8,7 @@ import ( "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" + "git.rosy.net.cn/jx-callback/globals" "strings" ) @@ -32,6 +33,7 @@ func GetProductFormatNew(categoryLeftId int64, vendorOrgCode string) (string, er if err != nil { return "", err } + globals.SugarLogger.Debug("========productFormatNew==============", productFormatNew) return string(productFormatNew), nil } From 960314c758751761f849ed987ff1127eca9d8c33 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 16:23:36 +0800 Subject: [PATCH 34/34] 1 --- business/partner/purchase/tiktok_store/store_sku2.go | 2 ++ business/partner/purchase/tiktok_store/store_sku2_utils.go | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index 6fabef5f1..4e2d69aa9 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -246,6 +246,8 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v // p.createOrUpdateStoreSkus(ctx, storeID, vendorStoreID, duplicateStoreSkuList(storeSkuList, i+1), true) // } //} + globals.SugarLogger.Debugf("============CreateStoreSkus===============%s", utils.Format4Output(failedList, false)) + globals.SugarLogger.Debugf("============CreateStoreSkus===============%s", err) return failedList, err } diff --git a/business/partner/purchase/tiktok_store/store_sku2_utils.go b/business/partner/purchase/tiktok_store/store_sku2_utils.go index cb036353a..f2136fbe0 100644 --- a/business/partner/purchase/tiktok_store/store_sku2_utils.go +++ b/business/partner/purchase/tiktok_store/store_sku2_utils.go @@ -33,7 +33,7 @@ func GetProductFormatNew(categoryLeftId int64, vendorOrgCode string) (string, er if err != nil { return "", err } - globals.SugarLogger.Debug("========productFormatNew==============", productFormatNew) + globals.SugarLogger.Debug("========productFormatNew==============", string(productFormatNew)) return string(productFormatNew), nil }