- 去掉两个没有用的状态OrderStatusFailed，OrderStatusRefund

- 准备将OrderStatusDelivered合并至OrderStatusFinished

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

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 (

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,

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,