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

src/Buyer/Lib/AgentInterface.php

@@ -12,6 +12,8 @@ interface AgentInterface
 {
 {
 	public function getByUnionId(string $unionId, int $storeId);
 	public function getByUnionId(string $unionId, int $storeId);
 
 
+	public function getByOpenId(string $openId, int $storeId);
+
 	/**
 	/**
 	 * 代理是否可用
 	 * 代理是否可用
 	 * @param int $storeId
 	 * @param int $storeId
@@ -19,4 +21,5 @@ interface AgentInterface
 	 * @return bool
 	 * @return bool
 	 */
 	 */
 	public function usefulAgent(int $storeId, int $agentId);
 	public function usefulAgent(int $storeId, int $agentId);
+
 }
 }
\ No newline at end of file

src/Buyer/Lib/BuyerInterface.php

@@ -129,4 +129,12 @@ interface BuyerInterface
 	 * @return mixed
 	 * @return mixed
 	 */
 	 */
 	public function updateUser($storeId, $buyerId, $data);
 	public function updateUser($storeId, $buyerId, $data);
+
+	/**
+	 * 获取买家信息
+	 * @param $storeId
+	 * @param $openId
+	 * @return mixed
+	 */
+	public function getUserByOpenId($storeId, $openId);
 }
 }
\ No newline at end of file

src/MemberCard/Lib/MemberCardInterface.php

@@ -20,6 +20,7 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferPayOrder(int $storeId,string $orderSn,int $payStatus)
  * @method ResultInterface deferPayOrder(int $storeId,string $orderSn,int $payStatus)
  * @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)
  */
  */
 /**
 /**
  * The interface of demo service
  * The interface of demo service
@@ -64,4 +65,13 @@ interface MemberCardInterface
      * @return array
      * @return array
      */   
      */   
     public function getOrderBySn(int $storeId,string $sn);
     public function getOrderBySn(int $storeId,string $sn);
+
+  /**
+   * 获取用户领卡状态：//0-没有卡 1-未领卡 2-领过了
+   *
+   * @param integer $storeId
+   * @param integer $userId
+   * @return void
+   */
+   public function ifUserGetCard(int $storeId,int $userId);
 }
 }