diff --git a/business/jxcallback/scheduler/basesch/basesch.go b/business/jxcallback/scheduler/basesch/basesch.go index bf9457854..0c7c7874f 100644 --- a/business/jxcallback/scheduler/basesch/basesch.go +++ b/business/jxcallback/scheduler/basesch/basesch.go @@ -191,9 +191,9 @@ func (c *BaseScheduler) CreateWaybill(platformVendorID int, order *model.GoodsOr balance = 0 } } - fmt.Println("1111111111111111111111",storeAcct) - fmt.Println("1111111111111111111111",result) - fmt.Println("1111111111111111111111",balance) + fmt.Println("1111111111111111111111", storeAcct) + fmt.Println("1111111111111111111111", result) + fmt.Println("1111111111111111111111", balance) //balance, _ = partner.CurStoreAcctManager.GetBrandBalance(storeDetail.BrandID) handlerInfo := partner.GetDeliveryPlatformFromVendorID(platformVendorID) if handlerInfo != nil && handlerInfo.Use4CreateWaybill { @@ -223,6 +223,7 @@ func (c *BaseScheduler) CancelWaybill(bill *model.Waybill, cancelReasonID int, c if c.IsReallyCallPlatformAPI && bill.OrderVendorID != bill.WaybillVendorID && bill.Status != model.WaybillStatusCanceled { if handlerInfo := partner.GetDeliveryPlatformFromVendorID(bill.WaybillVendorID); handlerInfo != nil { if err = utils.CallFuncLogErrorWithInfo(func() error { + fmt.Println("cancale ==================111", 22) return handlerInfo.Handler.CancelWaybill(bill, cancelReasonID, cancelReason) }, "CancelWaybill bill:%v", bill); err == nil { bill.Status = model.WaybillStatusCanceled diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 60932ef0e..6a68cce5a 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -967,6 +967,7 @@ func (s *DefScheduler) cancelOtherWaybills(savedOrderInfo *WatchOrderInfo, bill2 if v.Status < model.WaybillStatusEndBegin && !model.IsWaybillPlatformOwn(v) && (bill2Keep == nil || !(v.WaybillVendorID == bill2Keep.WaybillVendorID && v.VendorWaybillID == bill2Keep.VendorWaybillID)) { + fmt.Println("111111111111========cancel_Order", 1) err2 := s.CancelWaybill(v, cancelReasonID, cancelReason) if err2 == nil { // 在这里就从map里删除,而不是等收到运单结束事件才删除,可避免不必要的重复取消(第二次取消还会失败) diff --git a/business/partner/delivery/fn/waybill.go b/business/partner/delivery/fn/waybill.go index 560d28fb2..2924d38ee 100644 --- a/business/partner/delivery/fn/waybill.go +++ b/business/partner/delivery/fn/waybill.go @@ -67,7 +67,7 @@ func (c *DeliveryHandler) CancelWaybill(bill *model.Waybill, cancelReasonID int, OrderCancelRole: 2, } parameter.PartnerOrderCode = bill.VendorOrderID - + fmt.Println("===============cancle", 3333) if err = api.FnAPI.CancelOrder(parameter); err != nil { if strings.Contains(err.Error(), "运单暂未生成") { err = nil