From 190793d6ecb38c485eb1878e0ebc9fdce1946089 Mon Sep 17 00:00:00 2001 From: gazebo Date: Fri, 20 Sep 2019 17:18:33 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E9=A5=BF=E7=99=BE=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E4=BB=85=E4=BC=A0cat3=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/model/dao/store_sku.go | 31 +++++++++++--------- business/partner/purchase/ebai/store_sku2.go | 8 ++--- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index 69e64a00f..83aaee774 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -60,9 +60,12 @@ type StoreSkuSyncInfo struct { Img string DescImg string - VendorVendorCatID int64 `orm:"column(vendor_vendor_cat_id)"` // 平台商品分类（叶子结点） - VendorVendorCatID2 int64 `orm:"column(vendor_vendor_cat_id2)"` // 平台商品分类上一级 - VendorVendorCatID3 int64 `orm:"column(vendor_vendor_cat_id3)"` // 平台商品分类再上一级 + VendorVendorCatID int64 `orm:"column(vendor_vendor_cat_id)"` // 平台商品分类（叶子结点） + + // 饿百也只需要给出叶子结点了 + // https://open-be.ele.me/dev/notice?id=275 + // VendorVendorCatID2 int64 `orm:"column(vendor_vendor_cat_id2)"` // 平台商品分类上一级 + // VendorVendorCatID3 int64 `orm:"column(vendor_vendor_cat_id3)"` // 平台商品分类再上一级 // sku的商家分类信息 SkuStoreCatSyncStatus int8 @@ -224,10 +227,10 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, isDirty bool) tableName, fieldPrefix, fieldPrefix, vendorSkuNameField, GetImgFieldName(vendorID), GetImgFieldName(vendorID), GetDescImgFieldName(vendorID), fieldPrefix, fieldPrefix, } - if vendorID == model.VendorIDEBAI { - sql += `, - t4vp.vendor_category_id vendor_vendor_cat_id2, t4vp.parent_id vendor_vendor_cat_id3` - } + // if vendorID == model.VendorIDEBAI { + // sql += `, + // t4vp.vendor_category_id vendor_vendor_cat_id2, t4vp.parent_id vendor_vendor_cat_id3` + // } if isSingleStorePF { sql += `, t5.%s_sync_status store_cat_sync_status, t5.%s_id vendor_cat_id, @@ -251,13 +254,13 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, isDirty bool) model.SkuStatusNormal, utils.DefaultTimeValue, } - if vendorID == model.VendorIDEBAI { - sql += ` - LEFT JOIN sku_vendor_category t4v ON t4v.vendor_category_id = CONCAT(t4.%s_category_id, '') AND t4v.vendor_id = ? - LEFT JOIN sku_vendor_category t4vp ON t4vp.vendor_category_id = t4v.parent_id AND t4v.vendor_id = ?` - fmtParams = append(fmtParams, fieldPrefix) - sqlParams = append(sqlParams, vendorID, vendorID) - } + // if vendorID == model.VendorIDEBAI { + // sql += ` + // LEFT JOIN sku_vendor_category t4v ON t4v.vendor_category_id = CONCAT(t4.%s_category_id, '') AND t4v.vendor_id = ? + // LEFT JOIN sku_vendor_category t4vp ON t4vp.vendor_category_id = t4v.parent_id AND t4v.vendor_id = ?` + // fmtParams = append(fmtParams, fieldPrefix) + // sqlParams = append(sqlParams, vendorID, vendorID) + // } if isSingleStorePF { sql += ` LEFT JOIN store_sku_category_map t5 ON t4.id = t5.category_id AND t5.store_id = t1.store_id AND t5.deleted_at = ? diff --git a/business/partner/purchase/ebai/store_sku2.go b/business/partner/purchase/ebai/store_sku2.go index 202f02aed..d4d9ad942 100644 --- a/business/partner/purchase/ebai/store_sku2.go +++ b/business/partner/purchase/ebai/store_sku2.go @@ -240,10 +240,10 @@ func genSkuParamsFromStoreSkuInfo2(storeSku *dao.StoreSkuSyncInfo, isCreate bool "left_num": model.MaxStoreSkuStockQty, "category_id": utils.Str2Int64(storeSku.VendorCatID), "predict_cat": 0, // 不使用推荐类目 - "cat1_id": getEbaiCat(storeSku.VendorVendorCatID3, 1), - "cat2_id": getEbaiCat(storeSku.VendorVendorCatID2, 2), - "cat3_id": getEbaiCat(storeSku.VendorVendorCatID, 3), - "weight": storeSku.Weight, + // "cat1_id": getEbaiCat(storeSku.VendorVendorCatID3, 1), + // "cat2_id": getEbaiCat(storeSku.VendorVendorCatID2, 2), + "cat3_id": getEbaiCat(storeSku.VendorVendorCatID, 3), + "weight": storeSku.Weight, "photos": []map[string]interface{}{ map[string]interface{}{ "is_master": true,