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

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

src/Order/Lib/OrderInterface.php

@@ -28,6 +28,7 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferOrderCount(int $storeId,int $orderType,array $itemIds)
  * @method ResultInterface deferAddShopsDailyStatistic(int $storeId,int $pId)
  * @method ResultInterface deferGetShopStatistic(int $storeId)
+ * @method ResultInterface deferGetShopDailyStatistic(int $storeId,int $startDate,int $endDate)
  */
 interface OrderInterface
 {
@@ -184,4 +185,15 @@ interface OrderInterface
      * @return array
      */
     public function getShopStatistic(int $storeId);
+
+    /**
+     * 指定时间（段）查询店铺交易统计
+     * 
+     * 
+     * @param integer $storeId
+     * @param integer $startDate
+     * @param integer $endDate
+     * @return array
+     */
+    public function getShopDailyStatistic(int $storeId,int $startDate,int $endDate);
 }
\ No newline at end of file