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

UPGRADE.md

+# 1.0.72
+- User实体增加判断是否是托管小程序授权的方法
+
+# 1.0.71
+- 买家关系vip统计接口
+
+# 1.0.70
+- 买家关系vip统计接口
+
 # 1.0.69
 - 添加砍价服务关闭订单的支付通知枚举项
 
-
 # 1.0.68
 - 添加店铺托管的RPC接口
 

src/Common/Entity/User.php

@@ -179,6 +179,20 @@ class User
         return $this->getValue('scope');
     }
 
+    /**
+     * 是否是通过托管的小程序授权
+     *
+     * @return boolean 如果是托管 返回true
+     */
+    public function isEntrusted()
+    {
+        $ent = $this->getValue('entrusted');
+        if($ent == 1) {
+            return true;
+        }
+        return false;
+    }
+
 
     public function initUser($token)
     {

src/Order/Enum/OrderEnum.php

@@ -30,6 +30,8 @@ class OrderEnum
     const TYPE_LIMIT = 2; //限时购订单
     const TYPE_COLLECTION = 3; //拼团
     const TYPE_CARD = 4; //储值卡购买订单
+    const TYPE_TIMESCARD = 5; //次卡
+
 
     
     const CHANGE_PRICE_FALSE = 1;
@@ -45,6 +47,7 @@ class OrderEnum
         self::TYPE_LIMIT,
         self::TYPE_COLLECTION,
         self::TYPE_CARD,
+        self::TYPE_TIMESCARD
     ];
 
     //可以直接预约的订单类型

src/Order/Enum/PayOriginEnum.php

@@ -7,6 +7,6 @@ class PayOriginEnum
     const SELLER_MINI_PROGRAM = 2;//卖家小程序
     const SELLER_MP = 3;//卖家公众号
     const CARD = 4;//储值卡支付
-
+    const TIMESCARD = 5;//次卡支付
 
 }
\ No newline at end of file

src/Seller/Lib/SellerInterface.php

@@ -20,6 +20,8 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferGetByIds(array $ids, $fields = ['*'])
  * @method ResultInterface deferGetAndUpdateOpenId($unionId, $openId)
  * @method ResultInterface deferSaveRelation($sellerId)
+ * @method ResultInterface deferUpdateRelationVip($sellerId, $isVip)
+ * @method ResultInterface deferCountVip($sellerId, $isVip)
  * Interface SellerInterface
  * @package App\Lib
  */
@@ -87,4 +89,8 @@ interface SellerInterface
 	public function getAndUpdateOpenId($unionId, $openId);
 
 	public function saveRelation($sellerId);
+
+	public function updateRelationVip($sellerId, $isVip);
+
+	public function countVip($sellerId);
 }
\ No newline at end of file