From 998c087d9f0ef0f36e9e34afc814a58bfb2f6941 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Thu, 26 Sep 2019 19:40:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=97=B6=E4=B8=8D=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8SkuName.ImgEbai?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/dao/store_sku.go | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index 9fece18bc..9113419e2 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -10,9 +10,9 @@ import (
 )
 
 var (
-	imgFieldMap = map[int]string{
-		model.VendorIDEBAI: "img_ebai",
-	}
+	// imgFieldMap = map[int]string{
+	// 	model.VendorIDEBAI: "img_ebai",
+	// }
 	dataResFieldMap = map[int]string{
 		model.VendorIDMTWM: "mtwm_url",
 		model.VendorIDEBAI: "ebai_url",
@@ -223,12 +223,12 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, isDirty bool)
 	t1.%s_sync_status store_sku_sync_status, %s vendor_name_id, t1.store_id, t1.deleted_at bind_deleted_at,
 	t2.*,
 	t3.id name_id, t3.prefix, t3.name, t3.unit, t3.upc, t3.%s desc_img,
-	IF(t11.%s <> '', t11.%s, IF(t3.%s <> '', t3.%s, t3.img)) img,
+	IF(t11.%s <> '', t11.%s, t3.img) img,
 	IF(t12.%s <> '', t12.%s, t3.img2) img2,
 	t4.%s_category_id vendor_vendor_cat_id`
 	fmtParams := []interface{}{
 		tableName, fieldPrefix, fieldPrefix, vendorSkuNameField, GetDescImgFieldName(vendorID),
-		GetDataResFieldName(vendorID), GetDataResFieldName(vendorID), GetImgFieldName(vendorID), GetImgFieldName(vendorID),
+		GetDataResFieldName(vendorID), GetDataResFieldName(vendorID),
 		GetDataResFieldName(vendorID), GetDataResFieldName(vendorID),
 		fieldPrefix,
 	}
@@ -309,7 +309,7 @@ func GetFullStoreSkus(db *DaoDB, vendorID, storeID int) (skus []*StoreSkuSyncInf
 	t1.%s_sync_status store_sku_sync_status, t1.store_id, t1.deleted_at bind_deleted_at,
 	t2.*, t2.id sku_id,
 	t3.id name_id, t3.prefix, t3.name, t3.unit, t3.upc, t3.desc_img,
-	IF(t11.%s <> '', t11.%s, IF(t3.%s <> '', t3.%s, t3.img)) img,
+	IF(t11.%s <> '', t11.%s, t3.img) img,
 	IF(t12.%s <> '', t12.%s, t3.img2) img2,
 	t4.%s_category_id vendor_vendor_cat_id,
 	t4.%s_sync_status store_cat_sync_status, t4.%s_id vendor_cat_id,
@@ -335,7 +335,7 @@ func GetFullStoreSkus(db *DaoDB, vendorID, storeID int) (skus []*StoreSkuSyncInf
 	fieldPrefix := ConvertDBFieldPrefix(model.VendorNames[vendorID])
 	sql = fmt.Sprintf(sql, fieldPrefix,
 		fieldPrefix,
-		GetDataResFieldName(vendorID), GetDataResFieldName(vendorID), GetImgFieldName(vendorID), GetImgFieldName(vendorID),
+		GetDataResFieldName(vendorID), GetDataResFieldName(vendorID),
 		GetDataResFieldName(vendorID), GetDataResFieldName(vendorID),
 		fieldPrefix,
 		fieldPrefix, fieldPrefix,
@@ -425,13 +425,13 @@ func SetStoreCategorySyncStatus(db *DaoDB, vendorID int, storeIDs []int, catIDs
 	return ExecuteSQL(db, sql, sqlParams...)
 }
 
-func GetImgFieldName(vendorID int) (fieldName string) {
-	fieldName = imgFieldMap[vendorID]
-	if fieldName == "" {
-		fieldName = "img"
-	}
-	return fieldName
-}
+// func GetImgFieldName(vendorID int) (fieldName string) {
+// 	fieldName = imgFieldMap[vendorID]
+// 	if fieldName == "" {
+// 		fieldName = "img"
+// 	}
+// 	return fieldName
+// }
 
 func GetDataResFieldName(vendorID int) (fieldName string) {
 	fieldName = dataResFieldMap[vendorID]