Merge remote-tracking branch 'origin/mark' into yonghui

2019-12-27 17:52:23 +08:00
parent ed8627c58a edbe3a92f7
commit b068d07c33
16 changed files with 239 additions and 83 deletions
--- a/business/model/const.go
+++ b/business/model/const.go
@@ -33,6 +33,7 @@ var (

 	OrderStatusName = map[int]string{
 		OrderStatusMsg:                  "通知消息",
+		OrderStatusWaybillTipChanged:    "小费变动",
 		OrderStatusRefuseFailedGetGoods: "取货失败审核驳回",
 		OrderStatusAdjust:               "订单调整完成",
 		OrderStatusApplyUrgeOrder:       "催单",
@@ -172,6 +173,8 @@ const (
 const (
 	OrderStatusMsg = -100

+	OrderStatusWaybillTipChanged = -80 // 订单小费变化
+
 	OrderStatusRefuseFailedGetGoods = -70 // 取货失败审核驳回
 	OrderStatusAdjust               = -65 // 原值-35 订单调整完成
 	OrderStatusApplyUrgeOrder       = -55 // 原值-15