From 90f16f87f27a782612ec4454ff4d2f5ffbfb04c9 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, 31 Mar 2021 13:45:56 +0800
Subject: [PATCH] aa

---
 business/model/dao/dao_order.go | 6 ++++++
 controllers/jx_order.go         | 1 +
 2 files changed, 7 insertions(+)

diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go
index 4c0cac9a9..387a5dcde 100644
--- a/business/model/dao/dao_order.go
+++ b/business/model/dao/dao_order.go
@@ -910,6 +910,12 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
 					sqlParams = append(sqlParams, utils.MustInterface2Int64(params["brandID"]))
 				}
 			}
+			if params["deliveryType"] != nil {
+				if params["deliveryType"].(string) != "" {
+					sqlWhere += " AND t1.delivery_type = ?"
+					sqlParams = append(sqlParams, params["deliveryType"].(string))
+				}
+			}
 			if params["cities"] != nil {
 				var cities []int
 				if err = utils.UnmarshalUseNumber([]byte(params["cities"].(string)), &cities); err != nil {
diff --git a/controllers/jx_order.go b/controllers/jx_order.go
index ed493e95d..1122937a7 100644
--- a/controllers/jx_order.go
+++ b/controllers/jx_order.go
@@ -298,6 +298,7 @@ func (c *OrderController) ExportMTWaybills() {
 // @Param	adjustCount		query	int		false	"最小调整次数"
 // @Param	brandID			query	int		false	"品牌ID"
 // @Param	mustInvoice		query	bool	false	"是否必须要求开发票"
+// @Param	deliveryType	query	string	false	"配送方式"
 // @Param	offset			query	int		false	"结果起始序号（以0开始，缺省为0）"
 // @Param	pageSize		query	int		false	"结果页大小（缺省为50，-1表示全部）"
 // @Success 200 {object} controllers.CallResult