+ AcceptOrRefuseFailedGetOrder

+ CallPMCourier
+ ConfirmReceiveGoods

business/model/const.go

@@ -67,24 +67,29 @@ var (
 	}
 
 	OrderStatusName = map[int]string{
-		OrderStatusMsg: "通知消息",
+		OrderStatusMsg:                  "通知消息",
+		OrderStatusRefuseFailedGetGoods: "取货失败审核驳回",
+		OrderStatusAdjust:               "订单调整完成",
+		OrderStatusWait4Pay:             "待付款",
+		OrderStatusApplyUrgeOrder:       "催单",
 
-		OrderStatusWait4Pay:       "待付款",
-		OrderStatusUnlocked:       "解锁",
-		OrderStatusLocked:         "锁定",
-		OrderStatusApplyUrgeOrder: "催单",
+		OrderStatusUnlocked: "解锁",
+		OrderStatusLocked:   "锁定",
 		// OrderStatusApplyRefund:    "申请退款",
-		OrderStatusApplyCancel: "申请取消",
+		OrderStatusUndoApplyCancel: "取消申请取消",
+		OrderStatusApplyCancel:     "申请取消",
 
 		OrderStatusUnknown: "一般事件",
 
-		OrderStatusNew:            "新订单",
-		OrderStatusAdjust:         "调整单",
-		OrderStatusAccepted:       "已接单",
-		OrderStatusFinishedPickup: "已拣货",
-		OrderStatusDelivering:     "配送中",
-		OrderStatusFinished:       "完成",
-		OrderStatusCanceled:       "取消",
+		OrderStatusNew:                 "新订单",
+		OrderStatusAccepted:            "已接单",
+		OrderStatusFinishedPickup:      "已拣货",
+		OrderStatusApplyFailedGetGoods: "取货失败待审核",
+		OrderStatusAgreeFailedGetGoods: "取货失败",
+		OrderStatusDelivering:          "配送中",
+		OrderStatusDeliverFailed:       "投递失败",
+		OrderStatusFinished:            "完成",
+		OrderStatusCanceled:            "取消",
 	}
 	WaybillStatusName = map[int]string{
 		WaybillStatusUnknown: "一般事件",
@@ -159,9 +164,10 @@ const (
 const (
 	OrderStatusMsg = -100
 
-	OrderStatusAdjust         = -65 // 原值-35 订单调整完成
-	OrderStatusWait4Pay       = -60 // 原值-30 下单待支付，微盟在这个时间发新订单事件
-	OrderStatusApplyUrgeOrder = -55 // 原值-15
+	OrderStatusRefuseFailedGetGoods = -70 // 取货失败审核驳回
+	OrderStatusAdjust               = -65 // 原值-35 订单调整完成
+	OrderStatusWait4Pay             = -60 // 原值-30 下单待支付，微盟在这个时间发新订单事件
+	OrderStatusApplyUrgeOrder       = -55 // 原值-15
 
 	OrderStatusUnlocked = -25
 	OrderStatusLocked   = -20
@@ -174,7 +180,12 @@ const (
 	OrderStatusNew            = 5  // 新订单
 	OrderStatusAccepted       = 10 // 已经接单，也即待出库，待拣货
 	OrderStatusFinishedPickup = 15 // 拣货完成
-	OrderStatusDelivering     = 20 // 开始配送，配送员已取货，从这里开始就是运单消息了
+
+	OrderStatusApplyFailedGetGoods = 17 // 取货失败待审核
+	OrderStatusAgreeFailedGetGoods = 18 // 取货失败
+
+	OrderStatusDelivering    = 20 // 开始配送，配送员已取货，从这里开始就是运单消息了
+	OrderStatusDeliverFailed = 25 // 投递失败
 
 	OrderStatusEndBegin = 100 // 以下的状态就是结束状态
 	OrderStatusFinished = 110 // 订单已完成
@@ -187,18 +198,24 @@ const (
 )
 
 const (
-	WaybillStatusUnknown = 0
+	WaybillStatusRefuseFailedGetGoods = -70
+	WaybillStatusUnknown              = 0
 
 	WaybillStatusNew            = 5
 	WaybillStatusAcceptCanceled = 8
 	WaybillStatusAccepted       = 10
 	WaybillStatusCourierArrived = 15 // 此状态是可选的，明确写出来是因为还是较重要的状态，但业务逻辑不应依赖此状态
-	WaybillStatusDelivering     = 20
+
+	WaybillStatusApplyFailedGetGoods = 17 // 取货失败待审核
+	WaybillStatusAgreeFailedGetGoods = 18 // 取货失败
+
+	WaybillStatusDelivering    = 20
+	WaybillStatusDeliverFailed = 25
 
 	WaybillStatusEndBegin  = 100 // 以下的状态就是结束状态
-	WaybillStatusDelivered = 105
+	WaybillStatusDelivered = 105 // todo 这个应该改为110，与订单对应
 	WaybillStatusCanceled  = 115
-	WaybillStatusFailed    = 120
+	WaybillStatusFailed    = 120 // todo 这个应该要去掉
 	WaybillStatusNeverSend = 125 // 这个状态指的是平台方不愿意配送，门店自己想办法。与WaybillStatusAcceptCanceled不一样，WaybillStatusAcceptCanceled可能之后还会尝试配送
 )