Merge branch 'ft-hdllh5' into test

UPGRADE_2.x.md

+# 2.0.25
+- 修改接口备注
+
+# 2.0.24
+- 新加获取托管小程序access_token的接口
+
+# 2.0.23
+- v3,v4整合上线
+
+# 2.0.22
+- 买家修改
+
 # 2.0.21
 # 2.0.21
 - fixbug:协程方式记腾讯云日志
 - fixbug:协程方式记腾讯云日志
 
 

src/Common/Entity/User.php

@@ -163,6 +163,10 @@ class User
         return $this->getValue('openid');
         return $this->getValue('openid');
     }
     }
 
 
+    public function getMpOpenId()
+    {
+        return $this->getValue('mpOpenid');
+    }
 
 
     public function getUnionid()
     public function getUnionid()
     {
     {

src/Order/Enum/PayOriginEnum.php

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

src/Wx3rd/Lib/EntrustedInterface.php

@@ -17,6 +17,7 @@ use Swoft\Core\ResultInterface;
  *
  *
  * @method ResultInterface deferGetEntrustedData(int $storeId, array $fields = [])
  * @method ResultInterface deferGetEntrustedData(int $storeId, array $fields = [])
  * @method ResultInterface deferGetEntrustedDataByMchid(int $mchid, array $fields = [])
  * @method ResultInterface deferGetEntrustedDataByMchid(int $mchid, array $fields = [])
+ * @method ResultInterface deferGetEntAccessToken($storeId)
  * @method ResultInterface deferGetWxpayCerts(int $storeId, $mchid)
  * @method ResultInterface deferGetWxpayCerts(int $storeId, $mchid)
  */
  */
 interface EntrustedInterface
 interface EntrustedInterface
@@ -31,6 +32,19 @@ interface EntrustedInterface
     public function getEntrustedData(int $storeId, array $fields = []);
     public function getEntrustedData(int $storeId, array $fields = []);
     
     
     /**
     /**
+     * 根据店铺ID获取托管小程序的 authorizer_access_token
+     * authorizer_access_token用来调用小程序的相关接口
+     *
+     * @param int $storeId
+     * @return array 
+     * array(
+     *   'appid' => 'wx234skdfjsd232k',
+     *   'access_token' => 'askdjflkasjdfkjasdkfjklasjl',
+     * )
+     */
+    public function getEntAccessToken($storeId);
+
+    /**
      * 根据店铺id和商户平台id获取对应的支付证书
      * 根据店铺id和商户平台id获取对应的支付证书
      * 
      * 
      * @param int $storeId
      * @param int $storeId