From 8b49da00f1652ca5355e99b1ab3575383d38860f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Tue, 4 Jul 2023 13:49:35 +0800
Subject: [PATCH] 1

---
 platformapi/tao_vegetable/order_afs.go      | 38 ++++++++++-----------
 platformapi/tao_vegetable/order_delivery.go |  8 ++---
 platformapi/tao_vegetable/order_model.go    | 18 ++++++++++
 3 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/platformapi/tao_vegetable/order_afs.go b/platformapi/tao_vegetable/order_afs.go
index f514dd86..8935b66c 100644
--- a/platformapi/tao_vegetable/order_afs.go
+++ b/platformapi/tao_vegetable/order_afs.go
@@ -78,72 +78,72 @@ func (a *API) PartialRefund(req *request2.AlibabaTclsAelophyRefundCsapplyRequest
 }
 
 // UserApplyRefund 用户申请售后单消息通知
-func (a *API) UserApplyRefund(c *http.Request) (*UserApplyRefundCallBack, error) {
+func (a *API) UserApplyRefund(c *http.Request) (*UserApplyRefundCallBack, string, error) {
 	globals.SugarLogger.Debugf("进入 UserApplyRefund")
 	data, err := ioutil.ReadAll(c.Body)
 	if err != nil {
-		return nil, err
+		return nil, "", err
 	}
 
 	if len(data) == 0 {
-		return nil, err
+		return nil, "", err
 	}
 	var result *UserApplyRefundCallBack
 	if err := json.Unmarshal(data, &result); err != nil {
-		return nil, err
+		return nil, "", err
 	}
-	return result, nil
+	return result, string(data), nil
 }
 
 // UserCancelRefundApply 用户取消售后申请
-func (a *API) UserCancelRefundApply(c *http.Request) (*UserCancelRefundApply, error) {
+func (a *API) UserCancelRefundApply(c *http.Request) (*UserCancelRefundApply, string, error) {
 	globals.SugarLogger.Debugf("进入 UserCancelRefundApply")
 	data, err := ioutil.ReadAll(c.Body)
 	if err != nil {
-		return nil, err
+		return nil, "", err
 	}
 
 	if len(data) == 0 {
-		return nil, err
+		return nil, "", err
 	}
 	var result *UserCancelRefundApply
 	if err := json.Unmarshal(data, &result); err != nil {
-		return nil, err
+		return nil, "", err
 	}
-	return result, nil
+	return result, string(data), nil
 }
 
 // OnSaleRefundOrder 用户售中取消
-func (a *API) OnSaleRefundOrder(c *http.Request) (*OnSaleCancel, error) {
+func (a *API) OnSaleRefundOrder(c *http.Request) (*OnSaleCancel, string, error) {
 	globals.SugarLogger.Debugf("进入 OnSaleRefundOrder")
 	body, _ := ioutil.ReadAll(c.Body)
 
 	if len(body) == 0 {
-		return nil, nil
+		return nil, "", nil
 	}
 	var onSaleOrder *OnSaleCancel
 	if err := json.Unmarshal(body, &onSaleOrder); err != nil {
-		return nil, err
+		return nil, "", err
 	}
-	return onSaleOrder, nil
+	return onSaleOrder, "", nil
 }
 
 // RefundOrderFinish 同城零售逆向订单状态完成接口(退款完成)
-func (a *API) RefundOrderFinish(c *http.Request) (*RefundOrderFinish, error) {
+func (a *API) RefundOrderFinish(c *http.Request) (*RefundOrderFinish, string, error) {
 	globals.SugarLogger.Debugf("进入 RefundOrderFinish")
 	data, err := ioutil.ReadAll(c.Body)
 	if err != nil {
-		return nil, err
+		return nil, "", err
 	}
 
 	if len(data) == 0 {
-		return nil, nil
+		return nil, "", nil
 	}
 	var result *RefundOrderFinish
 	if err := json.Unmarshal(data, &result); err != nil {
-		return nil, err
+		return nil, "", err
 	}
-	return result, nil
+	return result, "", nil
 }
 
 // QueryAfsOrderDetail 获取订单退款详情
diff --git a/platformapi/tao_vegetable/order_delivery.go b/platformapi/tao_vegetable/order_delivery.go
index 9bbc48d1..c0488188 100644
--- a/platformapi/tao_vegetable/order_delivery.go
+++ b/platformapi/tao_vegetable/order_delivery.go
@@ -13,18 +13,18 @@ import (
 )
 
 // ReaderOrderInfo 获取订单状态回调
-func (a *API) ReaderOrderInfo(c *http.Request) (*CallbackOrder, error) {
+func (a *API) ReaderOrderInfo(c *http.Request) (*CallbackOrder, string, error) {
 	body, _ := ioutil.ReadAll(c.Body)
 
 	if len(body) == 0 {
-		return nil, nil
+		return nil, "", nil
 	}
 	var callbackOrder *CallbackOrder
 	if err := json.Unmarshal(body, &callbackOrder); err != nil {
-		return nil, err
+		return nil, "", err
 	}
 
-	return callbackOrder, nil
+	return callbackOrder, string(body), nil
 }
 
 // QueryOrderDetail 自配送查询订单详情
diff --git a/platformapi/tao_vegetable/order_model.go b/platformapi/tao_vegetable/order_model.go
index 4bfb56c9..f26eafcd 100644
--- a/platformapi/tao_vegetable/order_model.go
+++ b/platformapi/tao_vegetable/order_model.go
@@ -42,6 +42,24 @@ type CancelSubOrder struct {
 	BizSubOrderId       int64  `json:"bizSubOrderId"`       // 要取消的子订单号
 	CancelStockQuantity string `json:"cancelStockQuantity"` // 库存单位取消数量
 }
+type T struct {
+	RefundFee        int    `json:"refundFee"`
+	MerchantCode     string `json:"merchantCode"`
+	RefundReason     string `json:"refundReason"`
+	BizRefundId      string `json:"bizRefundId"`
+	OutOrderId       string `json:"outOrderId"`
+	RefundPackageFee int    `json:"refundPackageFee"`
+	OrderFrom        int    `json:"orderFrom"`
+	SubRefundOrders  []struct {
+		RefundFee     int    `json:"refundFee"`
+		MaxRefundFee  int    `json:"maxRefundFee"`
+		OutSubOrderId string `json:"outSubOrderId"`
+		RefundAmount  int    `json:"refundAmount"`
+	} `json:"subRefundOrders"`
+	StoreId           string `json:"storeId"`
+	RefundDeliveryFee int    `json:"refundDeliveryFee"`
+	RefundId          string `json:"refundId"`
+}
 
 // UserApplyRefundCallBack 用户申请售后消息通知
 type UserApplyRefundCallBack struct {