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

src/MemberCard/Lib/MemberCardInterface.php

@@ -25,8 +25,10 @@ use Swoft\Core\ResultInterface;
  * @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)
  * @method ResultInterface deferGetUserValidCouponNum(int $storeId,int $escrow,int $userId)
  * @method ResultInterface deferIfCouponSuitOrder(int $storeId,int $userId,int $couponId,array $goods)
  * @method ResultInterface deferIfCouponSuitOrder(int $storeId,int $userId,int $couponId,array $goods)
- * @method ResultInterface deferUpMembercardBonus(int $storeId,int $escrow,int $userId,int $orderId,int $type,int $money=0,int $bonus=0)
+ * @method ResultInterface deferUpMembercardBonus(int $storeId,int $userId,int $orderId,int $type,int $money=0,int $bonus=0)
  * @method ResultInterface deferUpMembercardBalance(int $storeId,int $escrow,int $userId,int $balance)
  * @method ResultInterface deferUpMembercardBalance(int $storeId,int $escrow,int $userId,int $balance)
+ * @method ResultInterface deferGetBonusConvertMoney((int $storeId,int $userId,int $bonusToUse)
+ * @method ResultInterface deferVerifyBonusConvertMoney((int $storeId,int $userId,int $bonusToUse,int $price)
  */
  */
 /**
 /**
  * The interface of demo service
  * The interface of demo service
@@ -126,7 +128,6 @@ interface MemberCardInterface
    * 改变用户积分
    * 改变用户积分
    *
    *
    * @param integer $storeId
    * @param integer $storeId
-   * @param integer $escrow
    * @param integer $userId
    * @param integer $userId
    * @param integer $orderId
    * @param integer $orderId
    * @param integer $type   //类型 1 消费产生积分 2 积分抵扣 3订单关闭 （这里只要传1-3）【4 - 消费后订单关闭，原来增加积分的记录状态为4（1->4）】
    * @param integer $type   //类型 1 消费产生积分 2 积分抵扣 3订单关闭 （这里只要传1-3）【4 - 消费后订单关闭，原来增加积分的记录状态为4（1->4）】
@@ -134,7 +135,7 @@ interface MemberCardInterface
    * @param integer $bonus
    * @param integer $bonus
    * @return bool
    * @return bool
    */
    */
-  public function upMembercardBonus(int $storeId,int $escrow,int $userId,int $orderId,int $type,int $money=0,int $bonus=0);
+  public function upMembercardBonus(int $storeId,int $userId,int $orderId,int $type,int $money=0,int $bonus=0);
 
 
   /**
   /**
    * 用户储值卡余额 通知会员卡（显示在卡包 余额）
    * 用户储值卡余额 通知会员卡（显示在卡包 余额）
@@ -146,4 +147,25 @@ interface MemberCardInterface
    * @return bool
    * @return bool
    */
    */
   public function upMembercardBalance(int $storeId,int $escrow,int $userId,int $balance);
   public function upMembercardBalance(int $storeId,int $escrow,int $userId,int $balance);
+
+    /**
+   * 下单时 查询 积分能抵扣的金额
+   *
+   * @param integer $storeId
+   * @param integer $userId
+   * @param integer $bonusToUse  
+   * @return int  
+   */
+  public function getBonusConvertMoney(int $storeId,int $userId,int $bonusToUse);
+
+   /**
+   * 下单时 验证 积分能抵扣的金额
+   *
+   * @param integer $storeId
+   * @param integer $userId
+   * @param integer $bonusToUse
+   * @param integer $price //订单原价减去优惠券后的价格
+   * @return bool  //验证通过返回true，不通过返回false
+   */
+  public function verifyBonusConvertMoney(int $storeId,int $userId,int $bonusToUse,int $price);
 }
 }

src/Notice/Lib/NoticeInterface.php

@@ -17,7 +17,7 @@ use Swoft\Core\ResultInterface;
  *
  *
  * @method ResultInterface deferSend(int $storeId, array $sendTypes, array $data, $sendTime, string $redisKey) :bool
  * @method ResultInterface deferSend(int $storeId, array $sendTypes, array $data, $sendTime, string $redisKey) :bool
  * @method ResultInterface deferCancelSend(string $redisKey):bool
  * @method ResultInterface deferCancelSend(string $redisKey):bool
- * @method ResultInterface deferCostumerSend(string $openId);
+ * @method ResultInterface deferCostumerSend(string $openId, int $oemId = 0);
  */
  */
 interface NoticeInterface
 interface NoticeInterface
 {
 {
@@ -111,13 +111,14 @@ interface NoticeInterface
     public function send(array $sendTypes, array $data,  $sendTime, string  $redisKey='') :bool;
     public function send(array $sendTypes, array $data,  $sendTime, string  $redisKey='') :bool;
 
 
 
 
-    /**
-     * 公众号客服消息
-     *
-     * @param string $openId
-     * @return void
-     */
-    public function costumerSend(string $openId);
+	/**
+	 * 公众号客服消息
+	 *
+	 * @param string $openId
+	 * @param int    $oemId
+	 * @return void
+	 */
+    public function costumerSend(string $openId, int $oemId = 0);
 
 
 
 
     /**
     /**

src/Vip/Lib/VipInterface.php

@@ -25,4 +25,10 @@ interface VipInterface
 	public function getVip(int $vipId);
 	public function getVip(int $vipId);
 
 
 	public function tryVipCountByReferId(int $referId);
 	public function tryVipCountByReferId(int $referId);
+
+	public function getVipByOemId($oemId);
+
+	public function updateByOemId($oemId, $price);
+
+	public function saveByOemId($oemId, $price);
 }
 }
\ No newline at end of file

src/WithdrawCash/Lib/WithdrawCashInterface.php

@@ -18,7 +18,6 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferGetBuyerAccountListByStoreId(int $storeId,array $buyerIds)
  * @method ResultInterface deferGetBuyerAccountListByStoreId(int $storeId,array $buyerIds)
  * @method ResultInterface deferGetSellerCommission(array $sellerIds)
  * @method ResultInterface deferGetSellerCommission(array $sellerIds)
  * @method ResultInterface deferGetSellerFund(array $sellerIds)
  * @method ResultInterface deferGetSellerFund(array $sellerIds)
- * @method ResultInterface deferGetBuyerDistribution(int $storeId,array $buyerIds)
  */
  */
 interface WithdrawCashInterface{
 interface WithdrawCashInterface{
     /**
     /**
@@ -68,13 +67,4 @@ interface WithdrawCashInterface{
      * @return array
      * @return array
      */
      */
     public function getSellerFund(array $sellerIds);
     public function getSellerFund(array $sellerIds);
-
-    /**
-     * 批量查询指定店铺下分销商钱包
-     * 
-     * @param integer $storeId
-     * @param array $buyerIds
-     * @return array
-     */
-    public function getBuyerDistribution(int $storeId,array $buyerIds);
 }
 }
\ No newline at end of file