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

UPGRADE_2.x.md

+# 2.0.43
+- 优惠券上线
+
 # 2.0.42
 # 2.0.42
 - 活动方案+实物订单上线
 - 活动方案+实物订单上线
 
 

src/Goods/Lib/GoodsInterface.php

@@ -209,4 +209,12 @@ interface GoodsInterface
 	 *               ]
 	 *               ]
 	 */
 	 */
 	public function addStock($storeId, $goods);
 	public function addStock($storeId, $goods);
+
+	/**
+	 * 计算商品价格
+	 * @param $storeId
+	 * @param $goods ['goodsId'=>num]
+	 * @return mixed
+	 */
+	public function sumGoodsPrice($storeId, $goods);
 }
 }

src/MemberCard/Enum/CardType.php

+<?php
+namespace Hdll\Services\MemberCard\Enum;
+
+class CardType {
+
+    const member_card   = 0;
+    const cash = 100;
+    const gift = 200;
+
+    const CARD_TYPE = [
+        self::member_card =>'member_card',
+        self::cash => 'cash',
+        self::gift => 'gift'
+    ];
+
+
+}
\ No newline at end of file

src/MemberCard/Enum/CouponOrderStatus.php

+<?php
+
+namespace Hdll\Services\MemberCard\Enum;
+
+class CouponOrderStatus
+{
+    //订单状态
+    const STATUS_NORMAL = 1; //待支付
+    const STATUS_HAVE_PAY =2;  // 已经支付  //=已下单
+    const STATUS_PAY_EXCEPTION =3;  // 支付异常或过期未付 //=关闭订单
+    const STATUS_PAY_REFUND =4 ; // 退款   //=已过期
+}
\ No newline at end of file

src/MemberCard/Lib/MemberCardInterface.php

@@ -21,6 +21,10 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferGetOrder(int $storeId,int $id)
  * @method ResultInterface deferGetOrder(int $storeId,int $id)
  * @method ResultInterface deferGetOrderBySn(int $storeId,string $sn)
  * @method ResultInterface deferGetOrderBySn(int $storeId,string $sn)
  * @method ResultInterface deferIfUserGetCard(int $storeId,int $userId,int $escrow)
  * @method ResultInterface deferIfUserGetCard(int $storeId,int $userId,int $escrow)
+ * @method ResultInterface deferGetUserCouponDetail(int $storeId ,int $couponId)  
+ * @method ResultInterface deferSetUserCouponStatus(int $storeId,int $couponId,int $status)
+ * @method ResultInterface deferGetUserValidCouponNum(int $storeId,int $escrow,int $userId)
+ * @method ResultInterface deferIfCouponSuitOrder(int $storeId,int $userId,int $couponId,array $goods)
  */
  */
 /**
 /**
  * The interface of demo service
  * The interface of demo service
@@ -41,7 +45,7 @@ interface MemberCardInterface
 
 
 
 
      /**
      /**
-     * 支付订单
+     * 支付订单(H5快速买单)
      * @param integer $storeId
      * @param integer $storeId
      * @param string $orderSn
      * @param string $orderSn
      * @param integer $payStatus
      * @param integer $payStatus
@@ -75,4 +79,45 @@ interface MemberCardInterface
    * @return bool
    * @return bool
    */
    */
    public function ifUserGetCard(int $storeId,int $userId,int $escrow);
    public function ifUserGetCard(int $storeId,int $userId,int $escrow);
+
+   /**
+    * 查询优惠券详细信息
+    *
+    * @param integer $storeId
+    * @param integer $couponId
+    * @return void
+    */
+   public function getUserCouponDetail(int $storeId ,int $couponId);
+
+   /**
+    * 根据订单状态更改 优惠券的使用的相关状态
+    *
+    * @param integer $storeId
+    * @param integer $couponId
+    * @param integer $status
+    * @return bool
+    */
+   public function setUserCouponStatus(int $storeId,int $couponId,int $status);
+
+  /**
+   * 获取用户未失效优惠券数量
+   *
+   * @param integer $storeId
+   * @param integer $escrow
+   * @param integer $userId
+   * @return int
+   */
+   public function getUserValidCouponNum(int $storeId,int $escrow,int $userId);
+
+    /**
+   * 判断优惠券是否适用于订单（下单的时候调用）
+   *
+   * @param integer $storeId
+   * @param integer $userId
+   * @param integer $couponId
+   * @param array $goods      [{goodsId:totalPrice},...]
+   * @return bool
+   */
+  public function ifCouponSuitOrder(int $storeId,int $userId,int $couponId,array $goods);
+
 }
 }

src/Order/Lib/OrderInterface.php

@@ -15,7 +15,7 @@ use Swoft\Core\ResultInterface;
 /**
 /**
  * order servcie
  * order servcie
  *
  *
- * @method ResultInterface deferCreateOrder(int $buyerId,int $storeId,int $consigneeId,int $itemId,int $selectedNum,int $orderType,int $activityPrice,string $goodsName,string $goodsImage,string $activityName,int $goodsId,int $goodsPrice,string $message='',int $skuId=0,int $subStoreId=0,int $couponId=0);
+ * @method ResultInterface deferCreateOrder(int $buyerId,int $storeId,int $consigneeId,int $itemId,int $selectedNum,int $orderType,int $activityPrice,string $goodsName,string $goodsImage,string $activityName,int $goodsId,int $goodsPrice,string $message='',int $skuId=0,int $subStoreId=0,int $couponId=0,int $points=0);
  * @method ResultInterface deferGetOrderDetailBySubId(int $storeId,int $subOrderId,$ifSelf=true,bool $ifExtend=false)
  * @method ResultInterface deferGetOrderDetailBySubId(int $storeId,int $subOrderId,$ifSelf=true,bool $ifExtend=false)
  * @method ResultInterface deferGetOrderDetailByPid(int $storeId,int $pId, $ifSelf=false, $ifExtend=false)
  * @method ResultInterface deferGetOrderDetailByPid(int $storeId,int $pId, $ifSelf=false, $ifExtend=false)
  * @method ResultInterface deferGetOrderDetailByMainSn(int $storeId,string  $orderSn, $ifSelf=false, $ifExtend=false)
  * @method ResultInterface deferGetOrderDetailByMainSn(int $storeId,string  $orderSn, $ifSelf=false, $ifExtend=false)
@@ -32,6 +32,7 @@ use Swoft\Core\ResultInterface;
  * @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)
  * @method ResultInterface deferBuyerSpendAmount(int $storeId,int $buyerId)
+ * @method ResultInterface deferBanchGetShopStByDate(array $storeIds,int $date)
  */
  */
 interface OrderInterface
 interface OrderInterface
 {
 {
@@ -53,7 +54,8 @@ interface OrderInterface
      * @param string $message
      * @param string $message
      * @param integer $skuId
      * @param integer $skuId
      * @param integer $subStoreId 
      * @param integer $subStoreId 
-     * @param integer $couponId
+     * @param integer $couponId 优惠券iD
+     * @param integer $points 积分
      * @return mixed
      * @return mixed
      */
      */
     public function createOrder(
     public function createOrder(
@@ -72,7 +74,8 @@ interface OrderInterface
         string  $message = '',
         string  $message = '',
         int     $skuId=0,
         int     $skuId=0,
         int     $subStoreId=0,
         int     $subStoreId=0,
-        int $couponId=0
+        int     $couponId=0,
+        int     $points=0
     );
     );
     /**
     /**
     * 根据子订单ID查询订单详情
     * 根据子订单ID查询订单详情
@@ -225,4 +228,21 @@ interface OrderInterface
      * @return int
      * @return int
      */
      */
     public function buyerSpendAmount(int $storeId,int $buyerId);
     public function buyerSpendAmount(int $storeId,int $buyerId);
+
+    /**
+     * 批量查询指定日期及店铺的交易统计数据
+     * 
+     * @param array $storeIds
+     * @param integer $date
+     * @return array
+     * [
+     *  [
+     *       'storeId' => 11,//店铺ID
+     *       'buyerNum' => 0,//买家数
+     *       'orderNum' => 0,//订单数
+     *       'orderAmount' => 0//营业金额
+     *   ]
+     * ]
+     */
+    public function banchGetShopStByDate(array $storeIds,int $date);
 }
 }
\ No newline at end of file