Merge branch 'v4'

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;//定金订单
 
 
 
 
     
     

src/Order/Lib/OrderInterface.php

@@ -31,6 +31,7 @@ use Swoft\Core\ResultInterface;
  * @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 deferGetShopNewOrderNum(int $storeId)
  * @method ResultInterface deferOrderCountByCondition(int $storeId,array $condition)
  * @method ResultInterface deferOrderCountByCondition(int $storeId,array $condition)
+ * @method ResultInterface deferBuyerSpendAmount(int $storeId,int $buyerId)
  */
  */
 interface OrderInterface
 interface OrderInterface
 {
 {
@@ -215,4 +216,13 @@ interface OrderInterface
      * @return int
      * @return int
      */
      */
     public function orderCountByCondition(int $storeId,array $condition);
     public function orderCountByCondition(int $storeId,array $condition);
+
+    /**
+     * 获取用户微信总消费金额
+     * 
+     * @param integer $storeId
+     * @param integer $buyerId
+     * @return int
+     */
+    public function buyerSpendAmount(int $storeId,int $buyerId);
 }
 }
\ No newline at end of file