Merge branch 'v4' into test

src/Order/Enum/OrderEnum.php

@@ -28,9 +28,10 @@ class OrderEnum
     const TYPE_GOODS = 0; //商品订单
     const TYPE_GOODS = 0; //商品订单
     const TYPE_CUT_PRICE = 1; //砍价订单
     const TYPE_CUT_PRICE = 1; //砍价订单
     const TYPE_LIMIT = 2; //限时购订单
     const TYPE_LIMIT = 2; //限时购订单
-    const TYPE_COLLECTION = 3; //拼团
-    const TYPE_CARD = 4; //储值卡购买订单
-    const TYPE_TIMESCARD = 5; //次卡
+    const TYPE_COLLECTION = 3; //拼团订单
+    const TYPE_CARD = 4; //储值卡订单
+    const TYPE_TIMESCARD = 5; //次卡订单
+    const TYPE_DEPOSIT = 6;//定金订单