From 0bb932bcb420f85ea21ccf818b137668f966fb91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Tue, 1 Dec 2020 11:22:02 +0800 Subject: [PATCH] aa --- business/jxcallback/orderman/orderman_ext.go | 2 +- business/partner/purchase/jdshop/callback.go | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index 8c3ac8dc0..be923425b 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -968,7 +968,7 @@ func (c *OrderManager) getAfsOrderSkuInfo4ExportOrders(ctx *jxcontext.Context, f if err = err2; err != nil { return nil, err } - toDate = toDate.Add(7 * 24 * time.Hour) // todo 售后单最多只可能延后7天吧 + toDate = toDate.Add(30 * 24 * time.Hour) // todo 售后单最多只可能延后7天吧 sql := ` SELECT t2.* FROM afs_order t1 diff --git a/business/partner/purchase/jdshop/callback.go b/business/partner/purchase/jdshop/callback.go index c405e6f6e..af3d77072 100644 --- a/business/partner/purchase/jdshop/callback.go +++ b/business/partner/purchase/jdshop/callback.go @@ -111,6 +111,7 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err DeliveryType: model.OrderDeliveryTypeStoreSelf, StatusTime: utils.Str2Time(msg.OrderStartTime), OrderSeq: 0, + VendorOrgCode: msg.VendorOrgCode, } if len(msg.ConsigneeInfo.Mobile) != 11 { order.ConsigneeMobile = Decrypt(msg.ConsigneeInfo.Mobile) @@ -231,7 +232,7 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err // 如果是暂停，表示是预订单g if msg.OrderState == jdshopapi.OrderStatusPause || msg.OrderState == jdshopapi.OrderStatusPopPause { order.BusinessType = model.BusinessTypeDingshida - if time2, err := api.JdShopAPI.GetOrderExtInfoByOrderId(order.VendorOrderID2); err == nil { + if time2, err := getAPI(msg.VendorOrgCode).GetOrderExtInfoByOrderId(order.VendorOrderID2); err == nil { if time2 == "" { order.ExpectedDeliveredTime = order.OrderCreatedAt.Add(time.Hour) } else { @@ -247,7 +248,7 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err return nil, err } if msg.IDSopShipmenttype == jdshopapi.IdSopShipmenttypeTC { - if time2, err := api.JdShopAPI.GetOrderExtInfoByOrderId(order.VendorOrderID2); err == nil { + if time2, err := getAPI(msg.VendorOrgCode).GetOrderExtInfoByOrderId(order.VendorOrderID2); err == nil { order.BusinessType = model.BusinessTypeDingshida if time2 == "" { order.ExpectedDeliveredTime = order.OrderCreatedAt.Add(time.Hour)