From f8f5f77fbf99a6dc1be5388b03e048dc77318780 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Mon, 12 Nov 2018 14:03:02 +0800
Subject: [PATCH] - skuCategoryID for GetSkuNames - change OrderStatusName and
 WaybillStatusName to Chinese name

---
 business/jxstore/cms/sku.go | 14 ++++++++++++++
 business/model/const.go     | 34 +++++++++++++++++-----------------
 controllers/cms_sku.go      |  3 ++-
 3 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index 779ea9bd5..e77b0e638 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -215,6 +215,20 @@ func GetSkuNames(ctx *jxcontext.Context, keyword string, params map[string]inter
 		}
 		sql += ")"
 	}
+	if params["skuCategoryID"] != nil {
+		cat := &model.SkuCategory{}
+		cat.ID = params["skuCategoryID"].(int)
+		if err = dao.GetEntity(db, cat); err != nil {
+			return nil, err
+		}
+		sql += " AND (t2.category_id = ?"
+		sqlParams = append(sqlParams, cat.ID)
+		if cat.Level == 1 {
+			sql += " OR t2.category_id IN (SELECT id FROM sku_category WHERE parent_id = ?)"
+			sqlParams = append(sqlParams, cat.ID)
+		}
+		sql += ")"
+	}
 	if params["vendorSkuIDs"] != nil {
 		var vendorSkuIDs []int
 		if err = utils.UnmarshalUseNumber([]byte(params["vendorSkuIDs"].(string)), &vendorSkuIDs); err != nil {
diff --git a/business/model/const.go b/business/model/const.go
index 6d633129d..348bf89de 100644
--- a/business/model/const.go
+++ b/business/model/const.go
@@ -36,25 +36,25 @@ var (
 	}
 
 	OrderStatusName = map[int]string{
-		OrderStatusNew:            "OrderStatusNew",
-		OrderStatusAdjust:         "OrderStatusAdjust",
-		OrderStatusAccepted:       "OrderStatusAccepted",
-		OrderStatusFinishedPickup: "OrderStatusFinishedPickup",
-		OrderStatusDelivering:     "OrderStatusDelivering",
-		OrderStatusDelivered:      "OrderStatusDelivered",
-		OrderStatusFinished:       "OrderStatusFinished",
-		OrderStatusCanceled:       "OrderStatusCanceled",
-		OrderStatusFailed:         "OrderStatusFailed",
+		OrderStatusNew:            "新订单",
+		OrderStatusAdjust:         "调整单",
+		OrderStatusAccepted:       "已接单",
+		OrderStatusFinishedPickup: "已拣货",
+		OrderStatusDelivering:     "配送中",
+		OrderStatusDelivered:      "送达",
+		OrderStatusFinished:       "完成",
+		OrderStatusCanceled:       "取消",
+		OrderStatusFailed:         "失败",
 	}
 	WaybillStatusName = map[int]string{
-		WaybillStatusNew:            "WaybillStatusNew",
-		WaybillStatusAcceptCanceled: "WaybillStatusAcceptCanceled",
-		WaybillStatusAccepted:       "WaybillStatusAccepted",
-		WaybillStatusCourierArrived: "WaybillStatusCourierArrived",
-		WaybillStatusDelivering:     "WaybillStatusDelivering",
-		WaybillStatusDelivered:      "WaybillStatusDelivered",
-		WaybillStatusCanceled:       "WaybillStatusCanceled",
-		WaybillStatusFailed:         "WaybillStatusFailed",
+		WaybillStatusNew:            "新运单",
+		WaybillStatusAcceptCanceled: "取消接受",
+		WaybillStatusAccepted:       "已接单",
+		WaybillStatusCourierArrived: "已到店",
+		WaybillStatusDelivering:     "配送中",
+		WaybillStatusDelivered:      "送达",
+		WaybillStatusCanceled:       "取消",
+		WaybillStatusFailed:         "失败",
 	}
 	OrderTypeName = map[int]string{
 		OrderTypeOrder:   "订单",
diff --git a/controllers/cms_sku.go b/controllers/cms_sku.go
index dc829838d..3771bf8f8 100644
--- a/controllers/cms_sku.go
+++ b/controllers/cms_sku.go
@@ -139,7 +139,8 @@ func (c *SkuController) SyncCategory() {
 // @Param	placeCond		query		string	false	"查询地点的条件（如果此字段没有设置，placeCode与isGlobal无效），and：与，or：或，指的是placeCode，isGlobal这两个条件间的关系，这组条件与其它条件都是与的关系"
 // @Param	placeCode		query		int		false	"可售地点Code"
 // @Param	isGlobal		query		bool	false	"是否全球可售"
-// @Param	categoryID		query		int		false	"商品所属类别ID"
+// @Param	categoryID		query		int		false	"商品名所属类别ID"
+// @Param	skuCategoryID	query		int		false	"商品所属类别ID"
 // @Param	unit			query		string	false	"商品单位"
 // @Param	fromStatus		query		int		false	"查询起始状态（0：下架，1：正常）"
 // @Param	toStatus		query		int		false	"查询起始状态（0：下架，1：正常）"