liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

a

Browse Source
This commit is contained in:
苏尹岚
2020-12-02 08:56:12 +08:00
parent 53f7119f71
commit 845068b29a
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/partner/purchase/jdshop/callback.go
View File

@@ -259,9 +259,6 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err
} }
} else { } else {
order.BusinessType = model.BusinessTypeImmediate order.BusinessType = model.BusinessTypeImmediate
if msg.OrderExt != nil && msg.OrderExt.O2ODeliveryTime != "" {
order.ExpectedDeliveredTime = utils.Str2Time(msg.OrderExt.O2ODeliveryTime)
} else {
if time2, err := getAPI(msg.VendorOrgCode).GetOrderExtInfoByOrderId(order.VendorOrderID2); err == nil { if time2, err := getAPI(msg.VendorOrgCode).GetOrderExtInfoByOrderId(order.VendorOrderID2); err == nil {
if time2 == "" { if time2 == "" {
order.ExpectedDeliveredTime = order.OrderCreatedAt.Add(time.Hour) order.ExpectedDeliveredTime = order.OrderCreatedAt.Add(time.Hour)
@@ -271,7 +268,6 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err
} }
} }
} }
}
setJdsOrderSeq(order) setJdsOrderSeq(order)
if order.OrderType == model.OrderTypeAddressErr { if order.OrderType == model.OrderTypeAddressErr {
buildOrderTo102919(order) buildOrderTo102919(order)