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

Merge branch 'master' into lcw

Browse Source
This commit is contained in:
gazebo
2019-04-04 15:50:15 +08:00
parent e61ae7a1b0 edaad0c9b6
commit bb882a016a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
business/jxcallback/scheduler/defsch/defsch_ext.go
View File

@@ -27,7 +27,8 @@ func (s *DefScheduler) SelfDeliveringAndUpdateStatus(ctx *jxcontext.Context, ven
order := savedOrderInfo.order order := savedOrderInfo.order
err = s.cancelOtherWaybills(savedOrderInfo, nil, partner.CancelWaybillReasonOther, partner.CancelWaybillReasonStrActive) err = s.cancelOtherWaybills(savedOrderInfo, nil, partner.CancelWaybillReasonOther, partner.CancelWaybillReasonStrActive)
if err == nil { if err == nil {
if order.DeliveryFlag&model.OrderDeliveryFlagMaskPurcahseDisabled == 0 { // todo
if true { //order.DeliveryFlag&model.OrderDeliveryFlagMaskPurcahseDisabled == 0 {
if savedOrderInfo.storeDeliveryType == scheduler.StoreDeliveryTypeByStore { if savedOrderInfo.storeDeliveryType == scheduler.StoreDeliveryTypeByStore {
if order.Status <= model.OrderStatusFinishedPickup { if order.Status <= model.OrderStatusFinishedPickup {
err = s.SelfDeliverDelivering(order, userName) err = s.SelfDeliverDelivering(order, userName)