From 776657ed2b7a5b1b4830f11775f2ccabb6e555e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 19 Feb 2020 11:38:55 +0800
Subject: [PATCH] =?UTF-8?q?getskunames=E5=85=B3=E4=BA=8E=E9=A5=BF=E9=B2=9C?=
 =?UTF-8?q?=E8=BE=BE=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sku.go | 6 +++---
 business/model/const.go     | 5 +++--
 controllers/cms_sku.go      | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index 35c118ef1..20c8b742e 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -421,10 +421,10 @@ func GetSkuNames(ctx *jxcontext.Context, keyword string, isBySku bool, params ma
 		}
 	}
 	if params["isExd"] != nil {
-		var idExd = params["isExd"].(bool)
-		if idExd {
+		var idExd = params["isExd"].(int)
+		if idExd == model.DISABLED {
 			sql += " AND t2.exd_sku_id <> ''"
-		} else {
+		} else if idExd == model.NO {
 			sql += " AND t2.exd_sku_id = ''"
 		}
 	} else {
diff --git a/business/model/const.go b/business/model/const.go
index 228d6eb79..e5d935b1b 100644
--- a/business/model/const.go
+++ b/business/model/const.go
@@ -396,8 +396,9 @@ const (
 )
 
 const (
-	YES = 1 //通用
-	NO  = 0
+	YES      = 1 //通用
+	NO       = 0
+	DISABLED = -1
 )
 
 func IsPurchaseVendorExist(vendorID int) bool {
diff --git a/controllers/cms_sku.go b/controllers/cms_sku.go
index 0faf886ad..eb3beff28 100644
--- a/controllers/cms_sku.go
+++ b/controllers/cms_sku.go
@@ -147,7 +147,7 @@ func (c *SkuController) SyncCategory() {
 // @Param	skuCategoryID	query		int		false	"商品所属类别ID"
 // @Param	unit			query		string	false	"商品单位"
 // @Param	isSpu			query		bool	false	"是否是SPU"
-// @Param	isExd			query		bool	false	"是否是饿鲜达商品"
+// @Param	isExd			query		int		false	"是否是饿鲜达商品 ，0为只查非饿鲜达，-1为只查饿鲜达，1为都查"
 // @Param	fromStatus		query		int		false	"查询起始状态（0：下架，1：正常）"
 // @Param	toStatus		query		int		false	"查询起始状态（0：下架，1：正常）"
 // @Param	offset			query		int		false	"门店列表起始序号（以0开始，缺省为0）"