From e166e0bc600ab2b15953c7196e0b05664f33d733 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 12 Jul 2023 18:48:40 +0800 Subject: [PATCH] 1 --- business/jxcallback/scheduler/defsch/defsch_ext.go | 2 +- business/partner/delivery/mtps/waybill.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/business/jxcallback/scheduler/defsch/defsch_ext.go b/business/jxcallback/scheduler/defsch/defsch_ext.go index 6ad9d0144..b63154176 100644 --- a/business/jxcallback/scheduler/defsch/defsch_ext.go +++ b/business/jxcallback/scheduler/defsch/defsch_ext.go @@ -162,7 +162,7 @@ func (s *DefScheduler) CreateWaybillOnProviders4SavedOrder(ctx *jxcontext.Contex // 检查订单是否在配送状态 waybills, err := dao.GetWaybills(dao.GetDB(), order.VendorOrderID, nil) for _, v := range waybills { - if v.Status >= model.OrderStatusDelivering { + if v.Status >= model.OrderStatusDelivering && v.Status != model.OrderStatusCanceled && v.Status != model.OrderStatusFinished { err = fmt.Errorf("订单已经在配送中,无法创建运单,有疑问请联系管理员") break } diff --git a/business/partner/delivery/mtps/waybill.go b/business/partner/delivery/mtps/waybill.go index 5354973e3..045a1ce83 100644 --- a/business/partner/delivery/mtps/waybill.go +++ b/business/partner/delivery/mtps/waybill.go @@ -99,6 +99,7 @@ func (c *DeliveryHandler) onWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *m } } + globals.SugarLogger.Debugf("===========msg := %s", utils.Format4Output(msg, false)) store, _ := dao.GetStoreDetail(dao.GetDB(), goodsOrder.JxStoreID, goodsOrder.VendorID, goodsOrder.VendorOrgCode) switch msg.Status { case mtpsapi.OrderStatusWaitingForSchedule: