From 366a6afc63e96503d170e83fd787f26152d24c44 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Fri, 27 Sep 2019 09:32:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=AF=B9=E4=BA=8ESkuName.Des?=
 =?UTF-8?q?cImgEbai=E7=9A=84=E4=BD=BF=E7=94=A8?=
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 f88a6d6c2..bfcd21adc 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -17,9 +17,9 @@ var (
 		model.VendorIDMTWM: "mtwm_url",
 		model.VendorIDEBAI: "ebai_url",
 	}
-	descImgFieldMap = map[int]string{
-		model.VendorIDEBAI: "desc_img_ebai",
-	}
+	// descImgFieldMap = map[int]string{
+	// 	model.VendorIDEBAI: "desc_img_ebai",
+	// }
 )
 
 type SkuStoreCatInfo struct {
@@ -225,13 +225,13 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, isDirty bool)
 	t3.id name_id, t3.prefix, t3.name, t3.unit, t3.upc,
 	IF(t11.%s <> '', t11.%s, t3.img) img,
 	IF(t12.%s <> '', t12.%s, t3.img2) img2,
-	IF(t13.%s <> '', t13.%s, t3.%s) desc_img,
+	t13.%s desc_img,
 	t4.%s_category_id vendor_vendor_cat_id`
 	fmtParams := []interface{}{
 		tableName, fieldPrefix, fieldPrefix, vendorSkuNameField,
 		GetDataResFieldName(vendorID), GetDataResFieldName(vendorID),
 		GetDataResFieldName(vendorID), GetDataResFieldName(vendorID),
-		GetDataResFieldName(vendorID), GetDataResFieldName(vendorID), GetDescImgFieldName(vendorID),
+		GetDataResFieldName(vendorID),
 		fieldPrefix,
 	}
 	if isSingleStorePF {
@@ -315,7 +315,7 @@ func GetFullStoreSkus(db *DaoDB, vendorID, storeID int) (skus []*StoreSkuSyncInf
 	t3.id name_id, t3.prefix, t3.name, t3.unit, t3.upc,
 	IF(t11.%s <> '', t11.%s, t3.img) img,
 	IF(t12.%s <> '', t12.%s, t3.img2) img2,
-	IF(t13.%s <> '', t13.%s, t3.desc_img) desc_img,
+	t13.%s desc_img,
 	t4.%s_category_id vendor_vendor_cat_id,
 	t4.%s_sync_status store_cat_sync_status, t4.%s_id vendor_cat_id,
 	t5sku.%s_sync_status sku_store_cat_sync_status, t5sku.%s_id sku_vendor_cat_id
@@ -343,7 +343,7 @@ func GetFullStoreSkus(db *DaoDB, vendorID, storeID int) (skus []*StoreSkuSyncInf
 		fieldPrefix,
 		GetDataResFieldName(vendorID), GetDataResFieldName(vendorID),
 		GetDataResFieldName(vendorID), GetDataResFieldName(vendorID),
-		GetDataResFieldName(vendorID), GetDataResFieldName(vendorID),
+		GetDataResFieldName(vendorID),
 		fieldPrefix,
 		fieldPrefix, fieldPrefix,
 		fieldPrefix, fieldPrefix,
@@ -448,13 +448,13 @@ func GetDataResFieldName(vendorID int) (fieldName string) {
 	return fieldName
 }
 
-func GetDescImgFieldName(vendorID int) (fieldName string) {
-	fieldName = descImgFieldMap[vendorID]
-	if fieldName == "" {
-		fieldName = "desc_img"
-	}
-	return fieldName
-}
+// func GetDescImgFieldName(vendorID int) (fieldName string) {
+// 	fieldName = descImgFieldMap[vendorID]
+// 	if fieldName == "" {
+// 		fieldName = "desc_img"
+// 	}
+// 	return fieldName
+// }
 
 func GetStoresSkusInfo(db *DaoDB, storeIDs, skuIDs []int) (storeSkuList []*model.StoreSkuBind, err error) {
 	sql := `