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

- fix state machine bug.

Browse Source
This commit is contained in:
gazebo
2018-07-26 17:21:58 +08:00
parent 5f4af9ced0
commit 1b9e1a50d6
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/scheduler/defsch/defsch.go
View File

@@ -159,7 +159,7 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
if order.WaybillVendorID == model.VendorIDUnknown { if order.WaybillVendorID == model.VendorIDUnknown {
s.cancelOtherWaybills(savedOrderInfo, bill) s.cancelOtherWaybills(savedOrderInfo, bill)
s.updateOrderByBill(order, bill, false) s.updateOrderByBill(order, bill, false)
} else { } else if !(order.WaybillVendorID == bill.WaybillVendorID && order.VendorWaybillID == bill.VendorWaybillID) && bill.WaybillVendorID != order.VendorID {
// todo 当前逻辑，加载PENDING的ORDER时，正常状态也可能进这里 // todo 当前逻辑，加载PENDING的ORDER时，正常状态也可能进这里
s.CancelWaybill(bill) s.CancelWaybill(bill)
globals.SugarLogger.Warnf("OnWaybillStatusChanged Accepted orderID:%s got multiple bill:%v, order details:%v", order.VendorOrderID, bill, order) globals.SugarLogger.Warnf("OnWaybillStatusChanged Accepted orderID:%s got multiple bill:%v, order details:%v", order.VendorOrderID, bill, order)

4
business/scheduler/scheduler.go
View File

@@ -189,7 +189,8 @@ func (c *BaseScheduler) SelfDeliverDelievering(order *model.GoodsOrder) (err err
func (c *BaseScheduler) SelfDeliverDelievered(order *model.GoodsOrder) (err error) { func (c *BaseScheduler) SelfDeliverDelievered(order *model.GoodsOrder) (err error) {
globals.SugarLogger.Infof("SelfDeliverDelievered orderID:%s", order.VendorOrderID) globals.SugarLogger.Infof("SelfDeliverDelievered orderID:%s", order.VendorOrderID)
if order.Status == model.OrderStatusDelivering { // todo
if true { //order.Status == model.OrderStatusDelivering {
if c.IsReallyCallPlatformAPI { if c.IsReallyCallPlatformAPI {
err = utils.CallFuncLogError(func() error { err = utils.CallFuncLogError(func() error {
return c.GetPurchasePlatformFromVendorID(order.VendorID).SelfDeliverDelievered(order) return c.GetPurchasePlatformFromVendorID(order.VendorID).SelfDeliverDelievered(order)
@@ -225,6 +226,7 @@ func (c *BaseScheduler) CancelWaybill(bill *model.Waybill) (err error) {
err = utils.CallFuncLogError(func() error { err = utils.CallFuncLogError(func() error {
return handlerInfo.Handler.CancelWaybill(bill) return handlerInfo.Handler.CancelWaybill(bill)
}, "CancelWaybill bill:%v", bill) }, "CancelWaybill bill:%v", bill)
globals.SugarLogger.Debugf("CancelWaybill bill:%v canceled by myself")
} }
} }
return err return err