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

- fk

Browse Source
This commit is contained in:
gazebo
2019-09-18 14:16:30 +08:00
parent 135089e12b
commit f438b005a2
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -161,9 +161,11 @@ func (c *OrderManager) OnOrderStatusChanged(orderStatus *model.OrderStatus) (err
if err == nil { if err == nil {
dao.Commit(db) dao.Commit(db)
if !isDuplicated { if !isDuplicated {
// order.Skus = c.loadOrderSku(db, order.VendorOrderID, order.VendorID) if order != nil {
order.Skus = c.loadOrderSku(db, order.VendorOrderID, order.VendorID)
_ = scheduler.CurrentScheduler.OnOrderStatusChanged(order, orderStatus, false) _ = scheduler.CurrentScheduler.OnOrderStatusChanged(order, orderStatus, false)
} }
}
} else { } else {
dao.Rollback(db) dao.Rollback(db)
} }
@@ -471,6 +473,7 @@ func (c *OrderManager) addOrderStatus(orderStatus *model.OrderStatus, db *dao.Da
isDuplicated = true isDuplicated = true
} }
} else { } else {
order = nil
if dao.IsNoRowsError(err) { // todo 消息错序 if dao.IsNoRowsError(err) { // todo 消息错序
err = nil err = nil
} else { } else {