Merge remote-tracking branch 'origin/mark' into don

This commit is contained in:
Rosy-zhudan
2019-08-29 15:20:17 +08:00

View File

@@ -226,7 +226,7 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, isDirty bool)
}
if vendorID == model.VendorIDEBAI {
sql += `
LEFT JOIN sku_vendor_category t4v ON t4v.vendor_category_id = t4.%s_category_id AND t4v.vendor_id = ?
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)