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

- 饿百改了订单中的send_time类型，从string改为int了，FUCK

Browse Source
This commit is contained in:
gazebo
2019-03-19 15:34:07 +08:00
parent 5c640c08c5
commit d0587fef0a
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -74,11 +74,11 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
ConsigneeAddress: userMap["address"].(string), ConsigneeAddress: userMap["address"].(string),
CoordinateType: model.CoordinateTypeBaiDu, CoordinateType: model.CoordinateTypeBaiDu,
BuyerComment: utils.TrimBlankChar(utils.Interface2String(orderMap["remark"])), BuyerComment: utils.TrimBlankChar(utils.Interface2String(orderMap["remark"])),
ExpectedDeliveredTime: getTimeFromTimestampStr(utils.Interface2String(orderMap["send_time"])), ExpectedDeliveredTime: getTimeFromInterface(orderMap["send_time"]),
PickDeadline: utils.DefaultTimeValue, PickDeadline: utils.DefaultTimeValue,
VendorStatus: utils.Int64ToStr(utils.MustInterface2Int64(orderMap["status"])), VendorStatus: utils.Int64ToStr(utils.MustInterface2Int64(orderMap["status"])),
OrderSeq: int(utils.Str2Int64(utils.Interface2String(orderMap["order_index"]))), OrderSeq: int(utils.Str2Int64(utils.Interface2String(orderMap["order_index"]))),
StatusTime: getTimeFromTimestampStr(utils.Interface2String(orderMap["create_time"])), StatusTime: getTimeFromInterface(orderMap["create_time"]),
OriginalData: string(utils.MustMarshal(result)), OriginalData: string(utils.MustMarshal(result)),
ActualPayPrice: utils.MustInterface2Int64(orderMap["user_fee"]), ActualPayPrice: utils.MustInterface2Int64(orderMap["user_fee"]),
Skus: []*model.OrderSku{}, Skus: []*model.OrderSku{},
@@ -299,8 +299,13 @@ func (c *PurchaseHandler) postFakeFinishedPickupMsg(vendorOrderID string) {
}) })
} }
func getTimeFromTimestampStr(sendTime string) time.Time { func getTimeFromInterface(timeValue interface{}) time.Time {
timeStamp := utils.Str2Int64WithDefault(sendTime, 0) var timeStamp int64
if timeStr, ok := timeValue.(string); ok {
timeStamp = utils.Str2Int64WithDefault(timeStr, 0)
} else {
timeStamp = utils.Interface2Int64WithDefault(timeValue, 0)
}
if timeStamp < 1538103149 { // 立即达订单给的是1（而不是空，0），1538103149不是特殊值，只是一个任意之前的时间，这样写可以处理 if timeStamp < 1538103149 { // 立即达订单给的是1（而不是空，0），1538103149不是特殊值，只是一个任意之前的时间，这样写可以处理
return utils.DefaultTimeValue return utils.DefaultTimeValue
} }