From 9f011293740a1ba088444ea8fce854142c5e9c4e Mon Sep 17 00:00:00 2001 From: gazebo Date: Fri, 19 Apr 2019 15:02:38 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E5=8E=BB=E6=8E=89=E4=B8=A4=E4=B8=AA?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E7=94=A8=E7=9A=84=E7=8A=B6=E6=80=81OrderStat?= =?UTF-8?q?usFailed=EF=BC=8COrderStatusRefund=20-=20=E5=87=86=E5=A4=87?= =?UTF-8?q?=E5=B0=86OrderStatusDelivered=E5=90=88=E5=B9=B6=E8=87=B3OrderSt?= =?UTF-8?q?atusFinished?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/scheduler/basesch/basesch_ext.go | 2 +- business/model/const.go | 3 --- business/partner/purchase/jd/order.go | 6 +++--- business/partner/purchase/mtwm/order.go | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/business/jxcallback/scheduler/basesch/basesch_ext.go b/business/jxcallback/scheduler/basesch/basesch_ext.go index f3ab618b3..908cb9e36 100644 --- a/business/jxcallback/scheduler/basesch/basesch_ext.go +++ b/business/jxcallback/scheduler/basesch/basesch_ext.go @@ -58,7 +58,7 @@ func (c *BaseScheduler) SelfDeliveredAndUpdateStatus(ctx *jxcontext.Context, ven err = c.Swtich2SelfDelivered(order, userName) } if err == nil { - order.Status = model.OrderStatusDelivered + order.Status = model.OrderStatusFinished if err = partner.CurOrderManager.UpdateOrderStatusAndFlag(order); err == nil { globals.SugarLogger.Infof("SelfDeliveredAndUpdateStatus orderID:%s userName:%s successfully", vendorOrderID, userName) return err diff --git a/business/model/const.go b/business/model/const.go index 67ef93475..ffd2c7337 100644 --- a/business/model/const.go +++ b/business/model/const.go @@ -86,7 +86,6 @@ var ( OrderStatusDelivered: "送达", OrderStatusFinished: "完成", OrderStatusCanceled: "取消", - OrderStatusFailed: "失败", } WaybillStatusName = map[int]string{ WaybillStatusUnknown: "一般事件", @@ -180,8 +179,6 @@ const ( OrderStatusDelivered = 105 // 妥投 OrderStatusFinished = 110 // 订单已完成 OrderStatusCanceled = 115 // 订单已取消 - OrderStatusFailed = 120 // 订单已失败 - OrderStatusRefund = 125 // 订单全额退款 ) const ( diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go index 48c19db5b..a9aaa1ba4 100644 --- a/business/partner/purchase/jd/order.go +++ b/business/partner/purchase/jd/order.go @@ -23,9 +23,9 @@ var ( jdapi.OrderStatusWaitOutStore: model.OrderStatusAccepted, jdapi.OrderStatusFinishedPickup: model.OrderStatusFinishedPickup, jdapi.OrderStatusDelivering: model.OrderStatusDelivering, - jdapi.OrderStatusDelivered: model.OrderStatusDelivered, - jdapi.OrderStatusFinished: model.OrderStatusFinished, - jdapi.OrderStatusCanceled: model.OrderStatusCanceled, + jdapi.OrderStatusDelivered: model.OrderStatusFinished, + // jdapi.OrderStatusFinished: model.OrderStatusFinished, // todo 这个状态不是真正都完成的意思 + jdapi.OrderStatusCanceled: model.OrderStatusCanceled, jdapi.OrderStatusAdjust: model.OrderStatusAdjust, jdapi.OrderStatusUserApplyCancel: model.OrderStatusApplyCancel, diff --git a/business/partner/purchase/mtwm/order.go b/business/partner/purchase/mtwm/order.go index 6d3f7ee36..936b2b244 100644 --- a/business/partner/purchase/mtwm/order.go +++ b/business/partner/purchase/mtwm/order.go @@ -43,7 +43,7 @@ var ( mtwmapi.OrderStatusReceived: model.OrderStatusAccepted, mtwmapi.OrderStatusAccepted: model.OrderStatusFinishedPickup, mtwmapi.OrderStatusDelivering: model.OrderStatusDelivering, - mtwmapi.OrderStatusDelivered: model.OrderStatusDelivered, + mtwmapi.OrderStatusDelivered: model.OrderStatusUnknown, // 以mtwmapi.OrderStatusFinished为结束状态，这个当成一个中间状态（且很少看到这个状态） mtwmapi.OrderStatusFinished: model.OrderStatusFinished, mtwmapi.OrderStatusCanceled: model.OrderStatusCanceled,