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

1

Browse Source
This commit is contained in:
邹宗楠
2023-12-27 10:35:04 +08:00
parent e8c5c14981
commit fd9c9983e8
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/jxcallback/scheduler/basesch/basesch.go
View File

@@ -186,8 +186,7 @@ func (c *BaseScheduler) SelfDeliverDelivering(order *model.GoodsOrder, userName
} }
func (c *BaseScheduler) SelfDeliverDelivered(order *model.GoodsOrder, userName string) (err error) { func (c *BaseScheduler) SelfDeliverDelivered(order *model.GoodsOrder, userName string) (err error) {
if /*order.LockStatus == model.OrderStatusUnknown && */ order.Status >= model.OrderStatusFinishedPickup && if order.Status >= model.OrderStatusFinishedPickup && order.Status <= model.OrderStatusDelivering {
order.Status <= model.OrderStatusDelivering {
if c.IsReallyCallPlatformAPI { if c.IsReallyCallPlatformAPI {
err = utils.CallFuncLogError(func() error { err = utils.CallFuncLogError(func() error {
if err = partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID).SelfDeliverDelivered(order, userName); err == nil { if err = partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID).SelfDeliverDelivered(order, userName); err == nil {
@@ -196,6 +195,7 @@ func (c *BaseScheduler) SelfDeliverDelivered(order *model.GoodsOrder, userName s
c.CancelWaybill(bill, partner.CancelWaybillReasonOther, partner.CancelWaybillReasonStrActive) c.CancelWaybill(bill, partner.CancelWaybillReasonOther, partner.CancelWaybillReasonStrActive)
} }
} }
globals.SugarLogger.Debugf("===err0 := %v", err)
return err return err
}, "SelfDeliverDelivered orderID:%s", order.VendorOrderID) }, "SelfDeliverDelivered orderID:%s", order.VendorOrderID)
} }

3
business/jxcallback/scheduler/basesch/basesch_ext.go
View File

@@ -86,6 +86,7 @@ func (c *BaseScheduler) SelfDeliveredAndUpdateStatus(ctx *jxcontext.Context, ven
if err == nil { if err == nil {
if model.IsOrderDeliveryByStore(order) { if model.IsOrderDeliveryByStore(order) {
err = c.SelfDeliverDelivered(order, userName) err = c.SelfDeliverDelivered(order, userName)
globals.SugarLogger.Debugf("===err := %v", err)
} else if model.IsOrderDeliveryByPlatform(order) { } else if model.IsOrderDeliveryByPlatform(order) {
err = c.Swtich2SelfDelivered(order, userName) err = c.Swtich2SelfDelivered(order, userName)
} }
@@ -98,9 +99,11 @@ func (c *BaseScheduler) SelfDeliveredAndUpdateStatus(ctx *jxcontext.Context, ven
dao.UpdateEntity(dao.GetDB(), order, "Status", "OrderFinishedAt") dao.UpdateEntity(dao.GetDB(), order, "Status", "OrderFinishedAt")
} }
} }
globals.SugarLogger.Debugf("===err2 := %v", err)
return err return err
}() }()
}, jxutils.ComposeUniversalOrderID(vendorOrderID, vendorID)) }, jxutils.ComposeUniversalOrderID(vendorOrderID, vendorID))
globals.SugarLogger.Debugf("===err3 := %v", err)
return err return err
} }