From a73afc843c2bae6ab3b86b658f17643e56f86eeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 17 Oct 2023 17:18:07 +0800 Subject: [PATCH] 1 --- .../jxcallback/scheduler/defsch/defsch.go | 2 +- business/partner/purchase/ebai/waybill.go | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 97816e76b..2358c0f24 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -390,7 +390,7 @@ func (s *DefScheduler) OnOrderNew(order *model.GoodsOrder, isPending bool, isAut if order.Flag&model.OrderFlagMaskFake == 0 { utils.CallFuncAsync(func() { // order = setFakeActualPayPrice(order) - //netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeOrder, nil) + netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeOrder, nil) //目前暂且认为AdjustCount > 0 就是调整单 if order.AdjustCount > 0 { weixinmsg.NotifyAdjustOrder(order) diff --git a/business/partner/purchase/ebai/waybill.go b/business/partner/purchase/ebai/waybill.go index 5b7569e4e..cd8969ada 100644 --- a/business/partner/purchase/ebai/waybill.go +++ b/business/partner/purchase/ebai/waybill.go @@ -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 {