- 将skuName中的图片外移至dataResource

business/model/common.go

@@ -1,12 +1,13 @@
 package model
 
 var (
-	ValideMimeTypes = map[string]int{
-		"image/jpeg": 1,
-		"image/png":  1,
+	ValidMimeTypes = map[string][]string{
+		"image/jpeg": []string{"jpeg", "jpg"},
+		"image/png":  []string{"png"},
+		"image/gif":  []string{"gif"},
 
-		"video/mpeg": 1,
-		"video/mp4":  1,
+		"video/mpeg": []string{"mpeg", "mpg"},
+		"video/mp4":  []string{"mp4", "m4v"},
 	}
 )
 
@@ -17,6 +18,7 @@ type DataResource struct {
 
 	ResoureType string `orm:"size(48)" json:"resoureType"` // 资料的mime type
 	Name        string `orm:"size(48);index" json:"name"`
+	IsVendor    int8   `json:"isVendor"` // 是否是平台需要的（平台需要才会上传到平台）
 
 	MainURL  string `orm:"size(512);column(main_url);unique" json:"mainURL"`
 	QiniuURL string `orm:"size(512);column(qiniu_url);index" json:"qiniuURL"`

business/model/dao/common.go

@@ -8,16 +8,25 @@ func GetDataResource(db *DaoDB, hashCode, fullURL string) (dataRes *model.DataRe
 	sql := `
 	SELECT t1.*
 	FROM data_resource t1
-	WHERE 1 = 1`
+	WHERE 0 = 1`
 	sqlParams := []interface{}{}
 	if hashCode != "" {
-		sql += " AND t1.hash_code = ?"
+		sql += " OR t1.hash_code = ?"
 		sqlParams = append(sqlParams, hashCode)
 	}
 	if fullURL != "" {
-		sql += " AND (t1.main_url = ? OR t1.qiniu_url = ? OR t1.ebai_url = ? OR t1.mtwm_url = ?)"
+		sql += " OR t1.main_url = ? OR t1.qiniu_url = ? OR t1.ebai_url = ? OR t1.mtwm_url = ?"
 		sqlParams = append(sqlParams, fullURL, fullURL, fullURL, fullURL)
 	}
 	err = GetRow(db, &dataRes, sql, sqlParams...)
 	return dataRes, err
 }
+
+func GetNeedUploadDataResource(db *DaoDB) (dataRes *model.DataResource, err error) {
+	sql := `
+	SELECT t1.*
+	FROM data_resource t1
+	WHERE t1.is_vendor = 1 AND (t1.ebai_url = '' OR t1.mtwm_url = '')`
+	err = GetRow(db, &dataRes, sql)
+	return dataRes, err
+}