From 39a78d04f8c8a94ee27f5fa5663be9aa938184db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 29 May 2020 14:28:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=88=9D=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/misc/misc.go             |  2 ++
 business/partner/purchase/jdshop/order.go | 20 +++++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index 226797d12..0668bdb23 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -261,6 +261,8 @@ func Init() {
 		}, []string{
 			"04:05:06",
 		})
+		ScheduleTimerFuncByInterval(func() {
+		}, 5*time.Second, 5*time.Minute)
 	}
 	if configs, err := dao.QueryConfigs(dao.GetDB(), "ebaiStorePageCookieExdTOKEN", model.ConfigTypeCookie, ""); err == nil {
 		ebaiStorePageCookieExdTOKEN = configs[0].Value
diff --git a/business/partner/purchase/jdshop/order.go b/business/partner/purchase/jdshop/order.go
index 075526bc6..288df6ce8 100644
--- a/business/partner/purchase/jdshop/order.go
+++ b/business/partner/purchase/jdshop/order.go
@@ -1,8 +1,11 @@
 package jdshop
 
 import (
+	"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
+	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/model"
+	"git.rosy.net.cn/jx-callback/globals/api"
 )
 
 func (p *PurchaseHandler) AcceptOrRefuseFailedGetOrder(ctx *jxcontext.Context, order *model.GoodsOrder, isAcceptIt bool) (err error) {
@@ -10,10 +13,21 @@ func (p *PurchaseHandler) AcceptOrRefuseFailedGetOrder(ctx *jxcontext.Context, o
 }
 
 func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *model.GoodsOrder) {
+	result := &jdshopapi.AllOrdersResult{}
+	utils.Map2StructByJson(orderData, &result, false)
+	jdsOrder := result.OrderList[0]
+	order = &model.GoodsOrder{
+		VendorOrderID: utils.Int64ToStr(jdsOrder.OrderID),
+	}
 	return order
 }
 func (p *PurchaseHandler) GetOrder(vendorOrgCode, vendorOrderID string) (order *model.GoodsOrder, err error) {
-	return order, err
+	resultOrders, err := api.JdShopAPI.AllOrders(&jdshopapi.AllOrdersParam{
+		OrderID:  vendorOrderID,
+		Current:  1,
+		PageSize: 1,
+	})
+	return p.Map2Order(utils.Struct2FlatMap(resultOrders)), err
 }
 func (p *PurchaseHandler) GetOrderStatus(vendorOrgCode, vendorOrderID string) (status int, err error) {
 	return status, err
@@ -74,3 +88,7 @@ func (p *PurchaseHandler) AgreeOrRefuseRefund(ctx *jxcontext.Context, order *mod
 func (p *PurchaseHandler) ConfirmReceivedReturnGoods(ctx *jxcontext.Context, order *model.AfsOrder) (err error) {
 	return err
 }
+
+func GetJdsOrder(ctx *jxcontext.Context, vendorOrderID string) {
+
+}