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

src/Order/Enum/OrderEnum.php

@@ -9,21 +9,31 @@ namespace Hdll\Services\Order\Enum;
 
 class OrderEnum
 {
-
-  
     //订单状态
+    const STATUS_CANCEL = 0; //已取消
     const STATUS_UNPAID = 10; //待支付
     const STATUS_PAID = 20; //已支付
-    const STATUS_DELIVERY = 30; //已发货/已预约
-    const STATUS_DELIVERED = 40; //已收获/已核销
+    const STATUS_DELIVERY = 30; //已发货|已预约
+    const STATUS_ARRIVED = 31;  //已送达
+    const STATUS_DELIVERED = 40; //已收获|已核销
     const STATUS_REFUND = 50; //申请退款
     const STATUS_REFUNDED = 60; //已退款
-    const STATUS_CANCEL = 0; //已取消
     const STATUS_CLOSED = 70; //已关闭
     const STATUS_REFUNDING = 80; //退款中
     const STATUS_EVALUATION = 90; //已评价
     const STATUS_COLLECTION = 100; //团购进行中
 
+    //支付后的所有状态数组
+    const PAID_STATUS  = [
+        self::STATUS_PAID,
+        self::STATUS_DELIVERY,
+        self::STATUS_ARRIVED,
+        self::STATUS_REFUND,
+        self::STATUS_REFUNDING,
+        self::STATUS_DELIVERED,
+        self::STATUS_EVALUATION
+    ];
+
     //订单类别
     const CLASS_SERVICE = 1;//服务类
     const CLASS_PHYSICAL = 2;//实物类
@@ -36,48 +46,25 @@ class OrderEnum
     const TYPE_CARD = 4; //储值卡订单
     const TYPE_TIMESCARD = 5; //次卡订单
     const TYPE_DEPOSIT = 6;//定金订单
-
-
-    
-    const CHANGE_PRICE_FALSE = 1;
-    const CHANGE_PRICE_TRUE = 2;
-    
-
-    //对账锁定
-    const LOCK = 1; //订单锁定
-
+    //订单类型数组
     const ORDER_TYPES = [
         self::TYPE_GOODS,
         self::TYPE_CUT_PRICE,
         self::TYPE_LIMIT,
         self::TYPE_COLLECTION,
         self::TYPE_CARD,
-        self::TYPE_TIMESCARD
+        self::TYPE_TIMESCARD,
+        self::TYPE_DEPOSIT
     ];
 
-    //可以直接预约的订单类型
-    const CAN_RESERVE = [
-        self::TYPE_GOODS,
-        self::TYPE_CUT_PRICE,
-        self::TYPE_LIMIT,
-    ];
-
-    const PAY_STATUS  = [ //支付状态
-        self::STATUS_PAID,
-        self::STATUS_DELIVERY,
-        self::STATUS_COLLECTION
-    ];
-
-    const PAID_STATUS  = [ //支付后的所有状态数组
-        self::STATUS_PAID,
-        self::STATUS_DELIVERY,
-        self::STATUS_DELIVERED,
-        self::STATUS_EVALUATION
-    ];
+    //订单改价
+    const CHANGE_PRICE_FALSE = 1;//未改价
+    const CHANGE_PRICE_TRUE = 2;//改价
 
     //对账状态
-     const BALANCE_STATE_FALSE = 0; //未对账
-     const BALANCE_STATE_TRUE = 1;//已对账
+    const BALANCE_STATE_FALSE = 0; //未对账
+    const BALANCE_STATE_TRUE = 1;//已对账
+    const LOCK = 1; //对账异常锁定
 
     //退款状态
     const REFUND_NONE = 0;//无退款