From f85fa9e12a3c9a40ffeca81d90f355542c8bb0f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 21 Jan 2021 17:49:59 +0800
Subject: [PATCH] aa

---
 business/model/dao/dao_order.go  | 6 ++++++
 business/model/dao/permission.go | 4 ++++
 controllers/jx_order.go          | 1 +
 3 files changed, 11 insertions(+)

diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go
index 1dcf71c12..ddf5ba59c 100644
--- a/business/model/dao/dao_order.go
+++ b/business/model/dao/dao_order.go
@@ -904,6 +904,12 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
 					sqlParams = append(sqlParams, lockStatuss)
 				}
 			}
+			if params["brandID"] != nil {
+				if utils.MustInterface2Int64(params["brandID"]) != 0 {
+					sqlWhere += " AND t5.brand_id = ?"
+					sqlParams = append(sqlParams, utils.MustInterface2Int64(params["brandID"]))
+				}
+			}
 			if params["cities"] != nil {
 				var cities []int
 				if err = utils.UnmarshalUseNumber([]byte(params["cities"].(string)), &cities); err != nil {
diff --git a/business/model/dao/permission.go b/business/model/dao/permission.go
index 5ffa77c09..8f30879ef 100644
--- a/business/model/dao/permission.go
+++ b/business/model/dao/permission.go
@@ -110,3 +110,7 @@ func GetRoleMenu(db *DaoDB, roleIDs, menuIDs []int) (roleMenus []*model.RoleMenu
 	err = GetRows(db, &roleMenus, sql, sqlParams)
 	return roleMenus, err
 }
+
+func GetUserStores(db *DaoDB, userID string) {
+
+}
diff --git a/controllers/jx_order.go b/controllers/jx_order.go
index abea5399b..322370ded 100644
--- a/controllers/jx_order.go
+++ b/controllers/jx_order.go
@@ -296,6 +296,7 @@ func (c *OrderController) ExportMTWaybills() {
 // @Param	skuIDs			query	string	false	"包含的skuID列表，或的关系"
 // @Param	isJxFirst		query	bool	false	"排序是否京西订单优先（缺省为否）"
 // @Param	adjustCount		query	int		false	"最小调整次数"
+// @Param	brandID			query	int		false	"品牌ID"
 // @Param	mustInvoice		query	bool	false	"是否必须要求开发票"
 // @Param	offset			query	int		false	"结果起始序号（以0开始，缺省为0）"
 // @Param	pageSize		query	int		false	"结果页大小（缺省为50，-1表示全部）"