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

- saveOrder don't use unsuitable status.

Browse Source
This commit is contained in:
gazebo
2018-11-30 20:55:10 +08:00
parent 44a33a9d06
commit 421871334e
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
business/jxcallback/orderman/order.go
View File

@@ -130,7 +130,8 @@ func (c *OrderManager) saveOrder(order *model.GoodsOrder, isAdjust bool, db orm.
order.WaybillVendorID = model.VendorIDUnknown order.WaybillVendorID = model.VendorIDUnknown
order.OrderFinishedAt = utils.DefaultTimeValue order.OrderFinishedAt = utils.DefaultTimeValue
// hardcode 兼容京东消息错序问题 // todo hardcode 兼容京东消息错序问题
if true { //order.VendorID == model.VendorIDJD {
orderStatus := &model.OrderStatus{} orderStatus := &model.OrderStatus{}
if db.Raw(` if db.Raw(`
SELECT * SELECT *
@@ -139,10 +140,14 @@ func (c *OrderManager) saveOrder(order *model.GoodsOrder, isAdjust bool, db orm.
ORDER BY status_time DESC ORDER BY status_time DESC
LIMIT 1 LIMIT 1
`, model.OrderTypeOrder, order.VendorOrderID, order.VendorID).QueryRow(orderStatus) == nil { `, model.OrderTypeOrder, order.VendorOrderID, order.VendorID).QueryRow(orderStatus) == nil {
if orderStatus.Status > order.Status {
order.Status = orderStatus.Status order.Status = orderStatus.Status
order.VendorStatus = orderStatus.VendorStatus order.VendorStatus = orderStatus.VendorStatus
order.StatusTime = orderStatus.StatusTime order.StatusTime = orderStatus.StatusTime
} }
}
}
order.OrderCreatedAt = order.StatusTime order.OrderCreatedAt = order.StatusTime
// globals.SugarLogger.Debugf("saveOrder isAdjust:%t, order:%v", isAdjust, order) // globals.SugarLogger.Debugf("saveOrder isAdjust:%t, order:%v", isAdjust, order)