liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

Browse Source
This commit is contained in:
richboo111
2023-01-10 11:12:29 +08:00
parent 19345b1b70 88c8091188
commit 28cdb59573
2 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
business/jxstore/cms/sync_store_sku.go
View File

@@ -369,7 +369,14 @@ func sku2Update(vendorID int, sku *dao.StoreSkuSyncInfo, syncStatus int8) (item
}
sku.SkuSyncStatus = sku.SkuSyncStatus & model.SyncFlagNewMask
} else {
sku.SkuSyncStatus = sku.SkuSyncStatus & model.SyncFlagPriceMask
var skuSyncStatus int8 = 0
if model.VendorIDDD == sku.VendorID {
skuSyncStatus = sku.SkuSyncStatus
kvs["dd_id"] = sku.VendorSkuID
} else {
skuSyncStatus = sku.SkuSyncStatus & model.SyncFlagPriceMask
}
sku.SkuSyncStatus = skuSyncStatus
}
} else if syncStatus&model.SyncFlagStockMask != 0 {
if isStoreSkuSyncNeedDelete(sku) {

39
business/partner/purchase/tiktok_store/store_sku2_utils.go
View File

@@ -259,15 +259,6 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
if (err != nil || childrenProductId == 0) && !strings.Contains(err.Error(), "2010001") { // 2010001:重复创建渠道商品,就去更新
continue
//param := &superm_product_batchRedistributeStoreProduct_request.TaskParams{
// MainProductId: utils.Str2Int64(localThing[0].VendorThingID),
// AddStoreIds: []int64{utils.Str2Int64(vendorStoreID)},
// DelStoreIds: []int64{utils.Str2Int64(vendorStoreID)},
//}
//if _, err := api.BatchRedistributeStoreProduct(param); err != nil {
// failedList = putils.GetErrMsg2FailedSingleList(storeSku, err, storeID, model.VendorChineseNames[model.VendorIDDD], syncType)
// continue
//}
}
// 同步价格,库存,上架
@@ -345,10 +336,29 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
failedList = putils.GetErrMsg2FailedSingleList(storeSku, err, storeID, model.VendorChineseNames[model.VendorIDDD], syncType)
continue
}
//if mainProductDetail.Name == param.Name && (mainProductDetail.CategoryDetail.ThirdCid == param.CategoryLeafId || mainProductDetail.CategoryDetail.FourthCid == param.CategoryLeafId) {
// upDateChildrenPriceStockLaunch(api, storeSku, utils.Str2Int64(storeSku.VendorSkuID), vendorStoreID, syncType)
// continue
//}
if mainProductDetail.Name == param.Name && (mainProductDetail.CategoryDetail.ThirdCid == param.CategoryLeafId || mainProductDetail.CategoryDetail.FourthCid == param.CategoryLeafId) {
// 更新子品,同步方法会更新子品的同时去更新库存和价格!删除之后接下的同步步骤失效!
//if err := api.DeleteStoreCommodity(utils.Str2Int64(storeSku.VendorSkuID)); err != nil {
// failedList = putils.GetErrMsg2FailedSingleList(storeSku, err, storeID, model.VendorChineseNames[model.VendorIDDD], syncType)
// storeSku.SkuSyncStatus = model.SyncFlagStoreSkuModifiedMask
// continue
//}
//childrenProductId, err := api.CreateSubProduct(mainIdInt, utils.Str2Int64(vendorStoreID))
//if err != nil {
// failedList = putils.GetErrMsg2FailedSingleList(storeSku, err, storeID, model.VendorChineseNames[model.VendorIDDD], syncType)
// storeSku.SkuSyncStatus = model.SyncFlagStoreSkuModifiedMask
// continue
//}
//if (err != nil || childrenProductId == 0) && !strings.Contains(err.Error(), "2010001") { // 2010001:重复创建渠道商品,就去更新
// continue
//}
//
//// 同步价格,库存,上架
//storeSku.VendorSonSkuID = utils.Int64ToStr(childrenProductId) // (属性id skuID方案一)(自商品的商品id方案二)
//storeSku.VendorSkuID = utils.Int64ToStr(childrenProductId) // 子商品主id
upDateChildrenPriceStockLaunch(api, storeSku, utils.Str2Int64(storeSku.VendorSkuID), vendorStoreID, syncType)
continue
}
// 获取商品的属性
if storeSku.TiktokAttribute == "" || storeSku.TiktokAttribute == "{}" {
@@ -368,12 +378,11 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
param.MainProductId = mainIdInt
param.SpecPrices = GetSpecPrices(param.Specs, vendorStoreID, param.MainProductId, storeSku)
if err := api.EditStoreCommodity(param); err != nil {
globals.SugarLogger.Debugf("====EditStoreCommodity===== %s", err.Error())
failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDDD], syncType)
storeSku.VendorSkuID = utils.Int2Str(storeSku.SkuID)
}
storeSku.SkuSyncStatus = 57 // 品库修改 售卖状态待同步 价格待同步
storeSku.SkuSyncStatus = model.SyncFlagStoreSkuModifiedMask // 品库修改 售卖状态待同步 价格待同步
}
return
}