From b9112379dfefd489852ca6a81b82a2a408d1a7a2 Mon Sep 17 00:00:00 2001
From: renyutian <yutian.ren@rosy.net.cn>
Date: Wed, 24 Apr 2019 16:04:29 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A5=BF=E7=99=BE=E7=94=B1=E4=BA=8E=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E9=99=8D=E7=BA=A7=E8=80=8C=E5=AF=BC=E8=87=B4=E7=BB=93?=
 =?UTF-8?q?=E8=B4=A6=E6=95=B0=E6=8D=AE=E6=9C=89=E8=AF=AF=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/ebai/financial.go      | 13 ++++++++++++-
 business/partner/purchase/ebai/financial_test.go | 10 ++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/business/partner/purchase/ebai/financial.go b/business/partner/purchase/ebai/financial.go
index 8cb59a916..ebb444b0a 100644
--- a/business/partner/purchase/ebai/financial.go
+++ b/business/partner/purchase/ebai/financial.go
@@ -161,10 +161,21 @@ func (p *PurchaseHandler) AfsOrderDetail2Financial(orderData map[string]interfac
 
 // 存储饿百正向订单结账信息
 func (p *PurchaseHandler) OnOrderDetail(result map[string]interface{}, operation string) (err error) {
-	err = partner.CurOrderManager.SaveOrderFinancialInfo(p.OrderDetail2Financial(result), operation)
+	err = partner.CurOrderManager.SaveOrderFinancialInfo(p.OrderDetail2Financial(p.GetTrueEbaiOrder(result)), operation)
 	return err
 }
 
+func (p *PurchaseHandler) GetTrueEbaiOrder(result1 map[string]interface{}) (result2 map[string]interface{}) {
+	order := result1["order"].(map[string]interface{})
+	if utils.MustInterface2Int64(order["down_flag"]) == 1 {
+		result, err := api.EbaiAPI.OrderGet(utils.Interface2String(order["order_id"]))
+		if err == nil {
+			return p.GetTrueEbaiOrder(result)
+		}
+	}
+	return result1
+}
+
 func (p *PurchaseHandler) OrderDetail2Financial(result map[string]interface{}) (orderFinancial *model.OrderFinancial) {
 	orderFinancial = &model.OrderFinancial{
 		VendorID: model.VendorIDEBAI,
diff --git a/business/partner/purchase/ebai/financial_test.go b/business/partner/purchase/ebai/financial_test.go
index 198272c13..723ec6e75 100644
--- a/business/partner/purchase/ebai/financial_test.go
+++ b/business/partner/purchase/ebai/financial_test.go
@@ -7,6 +7,8 @@ import (
 	"time"
 
 	"git.rosy.net.cn/baseapi/platformapi/ebaiapi"
+	"git.rosy.net.cn/jx-callback/business/partner"
+	"git.rosy.net.cn/jx-callback/globals/api"
 )
 
 func TestOnFinancialMsg(t *testing.T) {
@@ -28,3 +30,11 @@ func TestOnFinancialMsg(t *testing.T) {
 	res := OnFinancialMsg(msg)
 	fmt.Println(res)
 }
+
+func TestOnOrderDetail(t *testing.T) {
+	orderID := "1554939646172038357"
+	result, err := api.EbaiAPI.OrderGet(orderID)
+	if err == nil {
+		new(PurchaseHandler).OnOrderDetail(result, partner.CreatedPeration)
+	}
+}