Merge branch 'xmy' of http://git.dev.2b3.cn/tencent/services into xmy

src/Goods/Lib/GoodsInterface.php

@@ -23,6 +23,7 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferGetSpecAttributeByGoodsId($goodsId, $storeId)
  * @method ResultInterface deferAfterServiceTmp($storeId)
  * @method ResultInterface deferAdminCountActivity($storeId)
+ * @method ResultInterface deferGetTopThreeSales($storeId)
  * Interface GoodsInterface
  * @package Hdll\Services\Goods\Lib
  */
@@ -155,4 +156,13 @@ interface GoodsInterface
 	 * @author work
 	 */
 	public function adminCountGoods($storeId);
+
+
+	/**
+	 * 销量前3的商品
+	 * @param $storeId
+	 * @return mixed
+	 * @author work
+	 */
+	public function getTopThreeSales($storeId);
 }

src/LimitTimeBuy/Enum/LimitTimeOrderEnum.php

@@ -7,9 +7,17 @@ class LimitTimeOrderEnum
 
 
     //订单状态
-    const STATUS_NORMAL = 1; //待支付  1未支付2已经支付3异常
-    const STATUS_HAVE_PAY =2;  // 已经支付
-    const STATUS_PAY_EXCEPTION =3;  // 支付异常或过期未付
-    const STATUS_PAY_REFUND =4 ; // 退款
+    const STATUS_NORMAL = 1; //待支付  1未支付2已经支付3异常 //=未付款
+    const STATUS_HAVE_PAY =2;  // 已经支付  //=已下单
+    const STATUS_PAY_EXCEPTION =3;  // 支付异常或过期未付 //=关闭订单
+    const STATUS_PAY_REFUND =4 ; // 退款   //=已过期
+
+
+    //------------状态转换-----------------------
+    const NOT_PAY = 3;//未付款
+    const HAVE_PAID_ORDER = 4;//已下单
+    const CLOSED = 7;//关闭订单
+    const OVERDUE =8;//已过期
+
 
 }
\ No newline at end of file