From 97afd1fbc6e0847c1822918994ee8cf8eca5af53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Sat, 27 Jun 2020 11:17:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controllers/jx_order.go  | 2 +-
 controllers/jx_order2.go | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/controllers/jx_order.go b/controllers/jx_order.go
index 11b54609c..e58520e1e 100644
--- a/controllers/jx_order.go
+++ b/controllers/jx_order.go
@@ -857,7 +857,7 @@ func (c *OrderController) RefundOrder() {
 		if err != nil {
 			return nil, "", err
 		}
-		afsSkuList, err := dao.GetAfsOrderSkuInfo(dao.GetDB(), params.VendorOrderID, "", params.VendorID)
+		afsSkuList, err := dao.GetAfsOrderSkuInfo(dao.GetDB(), params.VendorOrderID, "", params.VendorID, false)
 		if err != nil {
 			return nil, "", err
 		}
diff --git a/controllers/jx_order2.go b/controllers/jx_order2.go
index 8ff732a2d..ed557a21c 100644
--- a/controllers/jx_order2.go
+++ b/controllers/jx_order2.go
@@ -116,6 +116,7 @@ func (c *JxOrderController) GetMyOrders() {
 // @Param	token			header	string	true	"认证token"
 // @Param	vendorOrderID	query	string	false	"订单号，如果此项不为空，忽略其它所有查询条件"
 // @Param	afsOrderID		query	string	false	"售后单号"
+// @Param	userID			query	string	false	"用户ID"
 // @Param	fromTime 		query	string	false	"开始日期（包含），格式（2006-01-02），如果订单号为空此项必须要求"
 // @Param	toTime 			query	string	false	"结束日期（包含），格式（2006-01-02），如果订单号为空此项必须要求"
 // @Param	offset			query	int		false	"结果起始序号（以0开始，缺省为0）"