diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index 739ef94a4..4469debb5 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -293,6 +293,10 @@ func formalizeStoreSkuList(inSkuList []*dao.StoreSkuSyncInfo) []*dao.StoreSkuSyn if skuItem.VendorPrice > skuItem.BoxFee { skuItem.BoxFee = boxFee } + //如果商品上绑定了映射,就用商品上的 + if skuItem.SkuVendorMapCatID != "" { + skuItem.VendorVendorCatID = utils.Str2Int64(skuItem.SkuVendorMapCatID) + } skuItem.MergedStatus = jxutils.MergeSkuStatus(jxutils.MergeSkuStatus(skuItem.NameStatus, skuItem.Status), skuItem.StoreSkuStatus) skuItem.SkuName = jxutils.ComposeSkuNameSync(skuItem.Prefix, skuItem.Name, skuItem.Comment, skuItem.Unit, skuItem.SpecQuality, skuItem.SpecUnit, 0, skuItem.ExPrefix, skuItem.ExPrefixBegin, skuItem.ExPrefixEnd) skuItem.SkuNameOrigin = jxutils.ComposeSkuNameOriginal(skuItem.Prefix, skuItem.Name, skuItem.Comment, skuItem.Unit, skuItem.SpecQuality, skuItem.SpecUnit, 0) diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index e0a2fd9c5..ee1b09e91 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -111,8 +111,9 @@ type StoreSkuSyncInfo struct { SkuVendorCatID string `orm:"column(sku_vendor_cat_id)"` // sku_name的商家分类信息 - CatSyncStatus int8 - VendorCatID string `orm:"column(vendor_cat_id)"` + CatSyncStatus int8 + VendorCatID string `orm:"column(vendor_cat_id)"` + SkuVendorMapCatID string `orm:"column(sku_vendor_map_cat_id)"` VendorPrice int64 LockTime *time.Time @@ -431,7 +432,8 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo t4.%s_category_id vendor_vendor_cat_id, t4.name category_name, ts.name store_name, - tsu.ex_prefix, tsu.begin_at ex_prefix_begin, tsu.end_at ex_prefix_end, tsu.img_watermark` + tsu.ex_prefix, tsu.begin_at ex_prefix_begin, tsu.end_at ex_prefix_end, tsu.img_watermark, + tsu1.vendor_category_id sku_vendor_map_cat_id` fmtParams := []interface{}{ skuVendorIDField, fieldPrefix, fieldPrefix, fieldPrefix, GetDataResFieldName(vendorID), GetDataResFieldName(vendorID), @@ -466,6 +468,7 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo LEFT JOIN data_resource t15 ON t15.main_url = t3.img3 LEFT JOIN data_resource t13 ON t13.main_url = t3.desc_img LEFT JOIN sku_exinfo_map tsu ON tsu.name_id = t3.id AND tsu.deleted_at = ? AND tsu.vendor_id = t14.vendor_id + LEFT JOIN sku_vendor_category_map tsu1 ON tsu1.name_id = t1.id AND tsu1.deleted_at = ? AND tsu1.vendor_id = t14.vendor_id ` sqlParams := []interface{}{ vendorID, utils.DefaultTimeValue, @@ -474,6 +477,7 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo utils.DefaultTimeValue, utils.DefaultTimeValue, utils.DefaultTimeValue, + utils.DefaultTimeValue, } if globals.IsStoreSkuAct { sql += `