From cf7970f823d1f3b4fb58c19c50d2c2efeaa7352e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 31 Jul 2023 18:01:01 +0800 Subject: [PATCH] 1 --- business/jxcallback/scheduler/defsch/defsch.go | 11 ++++------- business/partner/purchase/tao_vegetable/order.go | 3 +++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 0ac88c8a9..b4801a298 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -712,13 +712,6 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo globals.SugarLogger.Warnf("OnWaybillStatusChanged AcceptCanceled orderID:%s got multiple bill:%v, order details:%v", order.VendorOrderID, bill, order) } } - // case model.WaybillStatusCourierArrived: // do nothing - // s.resetTimer(savedOrderInfo, bill, isPending) - // if s.isBillCandidate(order, bill) { - // } else { - // // s.ProxyCancelWaybill(order, bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime) - // globals.SugarLogger.Infof("OnWaybillStatusChanged CourierArrived order(%d, %s) bill(%d, %s), bill:%v shouldn't get here", order.WaybillVendorID, order.VendorWaybillID, bill.WaybillVendorID, bill.VendorWaybillID, bill) - // } case model.WaybillStatusCanceled, model.WaybillStatusFailed: s.removeWaybillFromMap(savedOrderInfo, bill.WaybillVendorID) if s.isBillCandidate(order, bill) || order.WaybillVendorID == model.VendorIDUnknown { @@ -740,6 +733,10 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo } } } + if order.Status == model.OrderStatusDelivering && bill.Status == model.WaybillStatusCanceled { + order.Status = model.OrderStatusFinishedPickup + dao.UpdateEntity(dao.GetDB(), order, "Status") + } if err := orderman.ResetCreateWaybillFee(nil, order, bill); err != nil { globals.SugarLogger.Errorf("ResetCreateWaybillFee err : %v", err) diff --git a/business/partner/purchase/tao_vegetable/order.go b/business/partner/purchase/tao_vegetable/order.go index 598630bfd..27fa9e57b 100644 --- a/business/partner/purchase/tao_vegetable/order.go +++ b/business/partner/purchase/tao_vegetable/order.go @@ -439,6 +439,9 @@ func (c *PurchaseHandler) callbackOrderMsg2Status(msg *tao_vegetable.CallbackOrd case tao_vegetable.OrderStatusSuccess: // 送达 orderStatus.Status = model.OrderStatusFinished orderStatus.Remark = "订单送达" + case tao_vegetable.OrderStatusRefundClose: // 订单取消 + orderStatus.Status = model.OrderStatusCanceled + orderStatus.Remark = "订单取消" } return orderStatus }