This commit is contained in:
邹宗楠
2023-10-17 17:18:07 +08:00
parent 62a6a667c1
commit a73afc843c
2 changed files with 10 additions and 11 deletions

View File

@@ -5,7 +5,6 @@ import (
"git.rosy.net.cn/baseapi/platformapi/ebaiapi"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxcallback/scheduler"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/partner"
"git.rosy.net.cn/jx-callback/globals/api"
@@ -49,15 +48,15 @@ func (c *PurchaseHandler) onWaybillMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaiap
order.CourierMobile = utils.Interface2String(result["phone"])
}
if order.Status == model.WaybillStatusNew {
order2, _ := partner.CurOrderManager.LoadOrder(order.VendorOrderID, order.WaybillVendorID)
if order2 != nil {
if order2.Status == model.OrderStatusWaitAccepted {
order2.Status = model.OrderStatusNew
scheduler.CurrentScheduler.OnOrderNew(order2, false, false)
}
}
}
//if order.Status == model.WaybillStatusNew {
// order2, _ := partner.CurOrderManager.LoadOrder(order.VendorOrderID, order.WaybillVendorID)
// if order2 != nil {
// if order2.Status == model.OrderStatusWaitAccepted {
// order2.Status = model.OrderStatusNew
// scheduler.CurrentScheduler.OnOrderNew(order2, false, false)
// }
// }
//}
} else if order.Status == model.WaybillStatusCanceled {
utils.AfterFuncWithRecover(timeout4WaybillCancel, func() {
if localOrder, err2 := partner.CurOrderManager.LoadOrder(order.VendorOrderID, model.VendorIDEBAI); err2 == nil {