Accept Merge Request #189: (su -> mark)

Merge Request: 饿先达商品分类完善
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/189

business/model/const.go

@@ -398,6 +398,11 @@ const (
 	MaxVendorPricePercentage = 400
 )
 
+const (
+	YES = 1 //通用
+	NO  = 0
+)
+
 func IsPurchaseVendorExist(vendorID int) bool {
 	_, ok := VendorNames[vendorID]
 	return ok && vendorID >= VendorIDPurchaseBegin && vendorID <= VendorIDPurchaseEnd

business/model/dao/sku.go

@@ -70,7 +70,8 @@ func GetCategories(db *DaoDB, parentID, level int, catIDs []int, isExd bool) (ca
 	if isExd {
 		sql += " ORDER BY t1.level, t1.exd_seq"
 	} else {
-		sql += " ORDER BY t1.level, t1.seq"
+		sql += ` AND t1.is_exd_spec = 0
+				 ORDER BY t1.level, t1.seq`
 	}
 	return cats, GetRows(db, &cats, sql, params)
 }

business/model/sku.go

@@ -151,8 +151,9 @@ type SkuCategory struct {
 	Status int8   `orm:"default(1)" json:"status"` //分类状态，0表示禁用，1表示启用
 	Img    string `orm:"size(512)" json:"img"`     //分类图片
 
-	ExdName string `json:"exdName"` //饿鲜达对应分类名
-	ExdSeq  int    `json:"exdSeq"`
+	ExdName   string `json:"exdName"` //饿鲜达对应分类名
+	ExdSeq    int    `json:"exdSeq"`
+	IsExdSpec int    `json:"isExdSpec"` //是否是饿鲜达特有新建的分类
 	// JdID         int64  `orm:"column(jd_id);index" json:"jdID"` // 这个是指商家自己的商品类别在京东平台上的ID
 	// JdSyncStatus int8   `orm:"default(2)" json:"jdSyncStatus"`
 }