解决冲突

src/Order/Lib/OrderInterface.php

@@ -29,6 +29,8 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferAddShopsDailyStatistic(int $storeId,int $pId)
  * @method ResultInterface deferAddShopsDailyStatistic(int $storeId,int $pId)
  * @method ResultInterface deferGetShopStatistic(int $storeId)
  * @method ResultInterface deferGetShopStatistic(int $storeId)
  * @method ResultInterface deferGetShopDailyStatistic(int $storeId,int $startDate,int $endDate)
  * @method ResultInterface deferGetShopDailyStatistic(int $storeId,int $startDate,int $endDate)
+ * @method ResultInterface deferGetShopNewOrderNum(int $storeId)
+ * @method ResultInterface deferOrderCountByCondition(int $storeId,array $condition)
  */
  */
 interface OrderInterface
 interface OrderInterface
 {
 {
@@ -190,11 +192,27 @@ interface OrderInterface
     /**
     /**
      * 指定时间（段）查询店铺交易统计
      * 指定时间（段）查询店铺交易统计
      * 
      * 
-     * 
      * @param integer $storeId
      * @param integer $storeId
      * @param integer $startDate
      * @param integer $startDate
      * @param integer $endDate
      * @param integer $endDate
      * @return array
      * @return array
      */
      */
     public function getShopDailyStatistic(int $storeId,int $startDate,int $endDate);
     public function getShopDailyStatistic(int $storeId,int $startDate,int $endDate);
+
+    /**
+     * 查询店铺新订单数
+     *
+     * @param integer $storeId
+     * @return int
+     */
+    public function getShopNewOrderNum(int $storeId);
+
+    /**
+     * 根据条件查询店铺订单数量(子订单数量)
+     *
+     * @param integer $storeId
+     * @param array $condition
+     * @return int
+     */
+    public function orderCountByCondition(int $storeId,array $condition);
 }
 }
\ No newline at end of file