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

business/model/dao/sku.go

@@ -254,8 +254,8 @@ func GetSkusWithVendor(db *DaoDB, vendorIDs []int, appOrgCodes []string, nameIDs
 	t2.upc,
 	t2.is_global,
 	t2.status name_status,
-	t2.img,
-	t2.img2,
+	IF(t11.resource_type IS NULL OR t11.resource_type <> ?, t2.img, '') img,
+	IF(t12.resource_type IS NULL OR t12.resource_type <> ?, t2.img2, '') img2,
 	t2.desc_img,
 
 	t5.jd_code vendor_place_code,
@@ -273,9 +273,13 @@ func GetSkusWithVendor(db *DaoDB, vendorIDs []int, appOrgCodes []string, nameIDs
 		AND t3m.vendor_id = t1m.vendor_id AND t3m.vendor_org_code = t1m.vendor_org_code
 	LEFT JOIN sku_name_place_bind t4 ON t2.is_global = 0 AND t4.name_id = t1.name_id
 		LEFT JOIN place t5 ON t5.code = t4.place_code
+	LEFT JOIN data_resource t11 ON t11.main_url = t2.img
+	LEFT JOIN data_resource t12 ON t12.main_url = t2.img2
 	WHERE 1 = 1
 	`
 	sqlParams := []interface{}{
+		model.MimeTypeGif,
+		model.MimeTypeGif,
 		model.ThingTypeSku,
 		utils.DefaultTimeValue,
 		model.ThingTypeCategory,

business/model/sku.go

@@ -223,12 +223,6 @@ type SkuAndName struct {
 	IsSpu  int
 }
 
-// func (*Sku) TableUnique() [][]string {
-// 	return [][]string{
-// 		[]string{"JdID", "DeletedAt"},
-// 	}
-// }
-
 func (*Sku) TableUnique() [][]string {
 	return [][]string{
 		[]string{"NameID", "SpecQuality", "SpecUnit", "DeletedAt"},