From 2101a5282eeb47dedab1729832ae33fb3bb4882d 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, 14 Apr 2021 13:41:07 +0800
Subject: [PATCH] aa

---
 business/model/dao/dao_order.go | 18 ++++++++++++++----
 controllers/jx_order.go         |  2 +-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go
index 164107104..78c44ee82 100644
--- a/business/model/dao/dao_order.go
+++ b/business/model/dao/dao_order.go
@@ -910,12 +910,22 @@ 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["deliveryTypes"] != nil {
+				var deliveryTypes []string
+				if err = utils.UnmarshalUseNumber([]byte(params["deliveryTypes"].(string)), &deliveryTypes); err != nil {
+					return nil, 0, err
+				}
+				if len(deliveryTypes) > 0 {
+					sqlWhere += " AND t1.delivery_type IN (" + GenQuestionMarks(len(deliveryTypes)) + ")"
+					sqlParams = append(sqlParams, deliveryTypes)
 				}
 			}
+			// 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 ec9f8dd81..b00d9d2ad 100644
--- a/controllers/jx_order.go
+++ b/controllers/jx_order.go
@@ -298,7 +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	deliveryTypes	query	string	false	"配送方式"
 // @Param	offset			query	int		false	"结果起始序号（以0开始，缺省为0）"
 // @Param	pageSize		query	int		false	"结果页大小（缺省为50，-1表示全部）"
 // @Success 200 {object} controllers.CallResult