Merge remote-tracking branch 'origin/test' 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/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);
 }
 }