From 45bb776ac9687d832ddce6c1cb075402239dea04 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Thu, 20 Dec 2018 16:05:18 +0800
Subject: [PATCH] - skuIDs and nameIDs for GetStoreSkus

---
 business/jxstore/cms/store_sku.go | 22 +++++++++++++++++++++-
 controllers/cms_store_sku.go      |  2 ++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index 4a37a1505..a6360f96e 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -121,6 +121,16 @@ func GetStoreSkus(ctx *jxcontext.Context, storeID int, isFocus bool, keyword str
 		sql += " AND t1.id = ?"
 		sqlParams = append(sqlParams, params["nameID"].(int))
 	}
+	if params["nameIDs"] != nil {
+		var nameIDs []int
+		if err = utils.UnmarshalUseNumber([]byte(params["nameIDs"].(string)), &nameIDs); err != nil {
+			return nil, err
+		}
+		if len(nameIDs) > 0 {
+			sql += " AND t1.id IN (" + dao.GenQuestionMarks(len(nameIDs)) + ")"
+			sqlParams = append(sqlParams, nameIDs)
+		}
+	}
 	if params["categoryID"] != nil {
 		cat := &model.SkuCategory{}
 		cat.ID = params["categoryID"].(int)
@@ -156,12 +166,22 @@ func GetStoreSkus(ctx *jxcontext.Context, storeID int, isFocus bool, keyword str
 		if ok {
 			sql += " AND t2.id = ?"
 			sqlParams = append(sqlParams, skuID)
-		} else {
+		} else { // todo 这里是没有用的，应该删除掉
 			skuIDs := params["skuID"].([]interface{})
 			sql += " AND t2.id IN (" + dao.GenQuestionMarks(len(skuIDs)) + ")"
 			sqlParams = append(sqlParams, skuIDs)
 		}
 	}
+	if params["skuIDs"] != nil {
+		var skuIDs []int
+		if err = utils.UnmarshalUseNumber([]byte(params["skuIDs"].(string)), &skuIDs); err != nil {
+			return nil, err
+		}
+		if len(skuIDs) > 0 {
+			sql += " AND t2.id IN (" + dao.GenQuestionMarks(len(skuIDs)) + ")"
+			sqlParams = append(sqlParams, skuIDs)
+		}
+	}
 	if isFocus && params["fromStatus"] != nil {
 		fromStatus := params["fromStatus"].(int)
 		toStatus := fromStatus
diff --git a/controllers/cms_store_sku.go b/controllers/cms_store_sku.go
index 9b8454940..fb8cf3969 100644
--- a/controllers/cms_store_sku.go
+++ b/controllers/cms_store_sku.go
@@ -23,7 +23,9 @@ type StoreSkuController struct {
 // @Param	isFocus			query		bool	true	"是否已关注（认领）"
 // @Param	keyword			query		string	false	"查询关键字（可以为空，为空表示不限制）"
 // @Param	nameID			query		int		false	"SkuName ID"
+// @Param	nameIDs			query		string	false	"SkuName ID列表对象"
 // @Param	skuID			query		int		false	"Sku ID"
+// @Param	skuIDs			query		string	false	"Sku ID列表对象"
 // @Param	name			query		string	false	"商品名称（不要求完全一致）"
 // @Param	prefix			query		string	false	"商品前缀（不要求完全一致）"
 // @Param	categoryID		query		int		false	"商品所属类别ID"