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

饿百最后期望送达用最后送达（latest_send_time)

Browse Source
This commit is contained in:
gazebo
2020-01-20 14:16:26 +08:00
parent 02e9e61295
commit 63cecd7c4c
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
business/partner/purchase/ebai/order.go
View File

@@ -187,6 +187,14 @@ func (p *PurchaseHandler) partRefund2OrderDetailSkuList(orderID string, orderDet
return skuList return skuList
} }
func getExpectedDeliveredTime(orderMap map[string]interface{}) (expectedTime time.Time) {
expectedTime = getTimeFromInterface(orderMap["latest_send_time"])
if utils.IsTimeZero(expectedTime) {
expectedTime = getTimeFromInterface(orderMap["send_time"])
}
return expectedTime
}
func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *model.GoodsOrder) { func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *model.GoodsOrder) {
result := orderData result := orderData
shopMap := result["shop"].(map[string]interface{}) shopMap := result["shop"].(map[string]interface{})
@@ -206,7 +214,7 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
ConsigneeAddress: utils.Interface2String(userMap["address"]), ConsigneeAddress: utils.Interface2String(userMap["address"]),
CoordinateType: model.CoordinateTypeBaiDu, CoordinateType: model.CoordinateTypeBaiDu,
BuyerComment: utils.TrimBlankChar(utils.Interface2String(orderMap["remark"])), BuyerComment: utils.TrimBlankChar(utils.Interface2String(orderMap["remark"])),
ExpectedDeliveredTime: getTimeFromInterface(orderMap["send_time"]), ExpectedDeliveredTime: getExpectedDeliveredTime(orderMap),
PickDeadline: utils.DefaultTimeValue, PickDeadline: utils.DefaultTimeValue,
VendorStatus: utils.Int64ToStr(utils.MustInterface2Int64(orderMap["status"])), VendorStatus: utils.Int64ToStr(utils.MustInterface2Int64(orderMap["status"])),
OrderSeq: int(utils.ForceInterface2Int64(orderMap["order_index"])), OrderSeq: int(utils.ForceInterface2Int64(orderMap["order_index"])),