- first edition of long pulling

This commit is contained in:
gazebo
2019-03-05 22:35:20 +08:00
parent aef4ab7348
commit ccf9a4d6b9
5 changed files with 238 additions and 0 deletions

View File

@@ -11,6 +11,7 @@ import (
"git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/model/dao"
"git.rosy.net.cn/jx-callback/business/msghub"
"git.rosy.net.cn/jx-callback/globals"
"github.com/astaxie/beego/orm"
)
@@ -64,6 +65,7 @@ func (c *OrderManager) OnOrderNew(order *model.GoodsOrder, msgVendorStatus strin
isDuplicated, err := addOrderOrWaybillStatus(status, db)
if err == nil && !isDuplicated {
if isDuplicated, err = c.SaveOrder(order, false, db); err == nil && !isDuplicated {
msghub.OnNewOrder(order)
err = scheduler.CurrentScheduler.OnOrderNew(order, false)
}
}
@@ -97,6 +99,7 @@ func (c *OrderManager) OnOrderAdjust(order *model.GoodsOrder, msgVendorStatus st
return err
}
if isDuplicated, err = c.SaveOrder(order, true, db); err == nil && !isDuplicated {
msghub.OnNewOrder(order)
// 因为订单调度器需要的是真实状态所以用order的状态
err = scheduler.CurrentScheduler.OnOrderNew(order, false)
err = scheduler.CurrentScheduler.OnOrderStatusChanged(model.Order2Status(order), false)