Merge remote-tracking branch 'origin/test' into test

src/Order/Enum/OrderEnum.php

@@ -13,7 +13,8 @@ class OrderEnum
     const STATUS_CANCEL = 0; //已取消
     const STATUS_CANCEL = 0; //已取消
     const STATUS_UNPAID = 10; //待支付
     const STATUS_UNPAID = 10; //待支付
     const STATUS_PAID = 20; //已支付
     const STATUS_PAID = 20; //已支付
-    const STATUS_DELIVERY = 30; //已发货|已预约
+    const STATUS_WAIT_DLV = 21; //待取货
+    const STATUS_DELIVERY = 30; //已发货|配送中|已预约
     const STATUS_ARRIVED = 31;  //已送达
     const STATUS_ARRIVED = 31;  //已送达
     const STATUS_DELIVERED = 40; //已收获|已核销
     const STATUS_DELIVERED = 40; //已收获|已核销
     const STATUS_REFUND = 50; //申请退款
     const STATUS_REFUND = 50; //申请退款