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

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/Lib/MemberCardInterface.php

@@ -23,7 +23,7 @@ use Swoft\Core\ResultInterface;
  * @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 deferGetUserCouponDetail(int $storeId ,int $couponId)  
  * @method ResultInterface deferSetUserCouponStatus(int $storeId,int $couponId,int $status)
  * @method ResultInterface deferSetUserCouponStatus(int $storeId,int $couponId,int $status)
- * 
+ *  @method ResultInterface deferGetUserValidCouponNum(int $storeId,int $escrow,int $userId)
  */
  */
 /**
 /**
  * The interface of demo service
  * The interface of demo service
@@ -97,4 +97,14 @@ interface MemberCardInterface
     * @return bool
     * @return bool
     */
     */
    public function setUserCouponStatus(int $storeId,int $couponId,int $status);
    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);
 }
 }