From 04abb297d6242632cec2f29e30212338bbd043c5 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 10:51:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E8=A5=BF=E5=94=AE=E5=90=8E=E5=8D=95?=
 =?UTF-8?q?=E5=8D=95=E4=B8=AA=E9=80=80=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jx/localjx/order.go |  5 +++++
 business/partner/purchase/jx/order_afs.go     |  2 +-
 controllers/jx_order2.go                      | 19 +++++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index 57b7515cb..cc286250c 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -202,6 +202,11 @@ func GetMyOrders(ctx *jxcontext.Context, fromDateStr, toDateStr string, params m
 	return pagedInfo, err
 }
 
+func GetMyAfsOrders(ctx *jxcontext.Context, fromDateStr, toDateStr string, params map[string]interface{}, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) {
+
+	return pagedInfo, err
+}
+
 func GetMyOrderCountInfo(ctx *jxcontext.Context, fromDate, toDate time.Time, statuss []int) (countInfo []*model.GoodsOrderCountInfo, err error) {
 	countInfo, err = dao.GetMyOrderCountInfo(dao.GetDB(), ctx.GetUserID(), fromDate, toDate, statuss)
 	return countInfo, err
diff --git a/business/partner/purchase/jx/order_afs.go b/business/partner/purchase/jx/order_afs.go
index 77c8c5080..3f042a212 100644
--- a/business/partner/purchase/jx/order_afs.go
+++ b/business/partner/purchase/jx/order_afs.go
@@ -57,7 +57,7 @@ func (c *PurchaseHandler) ConfirmReceivedReturnGoods(ctx *jxcontext.Context, ord
 
 // 发起全款退款
 func (c *PurchaseHandler) RefundOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string) (err error) {
-	err = fmt.Errorf("%s不支持售后全额退款，请让买家发起退款", model.VendorChineseNames[model.VendorIDJX])
+	c.PartRefundOrder(ctx, order, order.Skus, reason)
 	return err
 }
 
diff --git a/controllers/jx_order2.go b/controllers/jx_order2.go
index 2b5c561f0..f1a56b146 100644
--- a/controllers/jx_order2.go
+++ b/controllers/jx_order2.go
@@ -111,6 +111,25 @@ func (c *JxOrderController) GetMyOrders() {
 	})
 }
 
+// @Title 查询自己的售后单
+// @Description 查询自己的售后单
+// @Param	token			header	string	true	"认证token"
+// @Param	vendorOrderID	query	string	false	"订单号，如果此项不为空，忽略其它所有查询条件"
+// @Param	afsOrderID		query	string	false	"售后单号"
+// @Param	fromTime 		query	string	false	"开始日期（包含），格式（2006-01-02），如果订单号为空此项必须要求"
+// @Param	toTime 			query	string	false	"结束日期（包含），格式（2006-01-02），如果订单号为空此项必须要求"
+// @Param	offset			query	int		false	"结果起始序号（以0开始，缺省为0）"
+// @Param	pageSize		query	int		false	"结果页大小（缺省为50，-1表示全部）"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /GetMyAfsOrders [get]
+func (c *JxOrderController) GetMyAfsOrders() {
+	c.callGetMyAfsOrders(func(params *tJxorderGetMyAfsOrdersParams) (retVal interface{}, errCode string, err error) {
+
+		return retVal, "", err
+	})
+}
+
 // @Title 查询自己的订单状态数量信息
 // @Description 查询自己的订单状态数量信息
 // @Param	token			header	string	true	"认证token"