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

src/Auth/Enum/AuthEnum.php

@@ -26,11 +26,12 @@ class AuthEnum
 
 
     const AUTH_TYPE_SELLER = 200; //卖家授权
     const AUTH_TYPE_SELLER = 200; //卖家授权
     const AUTH_TYPE_EMPLOYEE = 201; //员工授权
     const AUTH_TYPE_EMPLOYEE = 201; //员工授权
-    const AUTH_TYPE_AGENT    = 201; //店铺分销代理者授权
-
+    
     const AUTH_TYPE_E_AND_S = 203; //选择授权（用户自己选择进行员工授权还是卖家授权）
     const AUTH_TYPE_E_AND_S = 203; //选择授权（用户自己选择进行员工授权还是卖家授权）
     const AUTH_TYPE_BUYER = 204; //买家授权
     const AUTH_TYPE_BUYER = 204; //买家授权
-
+    
+    const AUTH_TYPE_AGENT    = 205; //店铺分销代理者授权
+    const AUTH_TYPE_AGENT_BUYER = 206; // 买家进入分销商店授权
 
 
 
 
 
 

src/Buyer/Lib/AgentInterface.php

@@ -2,15 +2,18 @@
 
 
 namespace Hdll\Services\Buyer\Lib;
 namespace Hdll\Services\Buyer\Lib;
 
 
+
 /**
 /**
- * @method ResultInterface deferGetByUnionId(string $unionId)
+ * @method ResultInterface deferGetByUnionId(string $unionId, int $storeId)
  * @method ResultInterface deferUsefulAgent(int $storeId, int $agentId)
  * @method ResultInterface deferUsefulAgent(int $storeId, int $agentId)
  * Interface AgentInterface
  * Interface AgentInterface
  * @package Hdll\Services\Buyer\Lib
  * @package Hdll\Services\Buyer\Lib
  */
  */
 interface AgentInterface
 interface AgentInterface
 {
 {
-	public function getByUnionId(string $unionId);
+	public function getByUnionId(string $unionId, int $storeId);
+
+	public function getByOpenId(string $openId, int $storeId);
 
 
 	/**
 	/**
 	 * 代理是否可用
 	 * 代理是否可用
@@ -19,4 +22,19 @@ interface AgentInterface
 	 * @return bool
 	 * @return bool
 	 */
 	 */
 	public function usefulAgent(int $storeId, int $agentId);
 	public function usefulAgent(int $storeId, int $agentId);
+
+
+	/**
+	 * 创建分销商
+	 * @param $buyerId
+	 * @param $unionId
+	 * @param $openId
+	 * @param $storeId
+	 * @param $nickname
+	 * @param $headimgurl
+	 * @return array|mixed
+	 * @throws BaseException
+	 */
+	public function create($param);
+
 }
 }
\ 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

@@ -19,7 +19,8 @@ use Swoft\Core\ResultInterface;
  * @method  ResultInterface deferGetWxMsg(array $msgArr)
  * @method  ResultInterface deferGetWxMsg(array $msgArr)
  * @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);
 }
 }