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

UPGRADE_2.x.md

+# 2.0.10
+- 根据商户平台id获取对应的小程序托管配置
+
+# 2.0.9
+- 修改wx3rd服务常量名错误
+
+# 2.0.8
+- 添加获取托管小程序支付证书的接口
+
+# 2.0.7
+- 商品后续服务
+
 # 2.0.6
 - 砍价、限时购 加 消息队列 upOrderStatus

src/Common/Pool/Config/Wx3rdPoolConfig.php

@@ -23,7 +23,7 @@ class Wx3rdPoolConfig extends PoolProperties
     public function __construct()
     {
         // 区别本地和线上的RPC服务地址
-        $this->uri = explode(',', env('RPC_STORE_URI', 'wx3rd:8099'));
+        $this->uri = explode(',', env('RPC_WX3RD_URI', 'wx3rd:8099'));
     }
 
     protected $name = 'wx3rd';

src/Goods/Lib/GoodsInterface.php

@@ -24,6 +24,7 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferAfterServiceTmp($storeId)
  * @method ResultInterface deferAdminCountActivity($storeId)
  * @method ResultInterface deferGetTopThreeSales($storeId)
+ * @method ResultInterface deferGetReturnVisitByGoodsIds($storeId, $goodsIds)
  * Interface GoodsInterface
  * @package Hdll\Services\Goods\Lib
  */
@@ -165,4 +166,13 @@ interface GoodsInterface
 	 * @author work
 	 */
 	public function getTopThreeSales($storeId);
+
+	/**
+	 * 批量获取后续服务 goodIds
+	 * @param $storeId
+	 * @param $goodsIds
+	 * @return mixed
+	 * @author work
+	 */
+	public function getReturnVisitByGoodsIds($storeId, $goodsIds);
 }

src/Wx3rd/Lib/EntrustedInterface.php

@@ -16,6 +16,8 @@ use Swoft\Core\ResultInterface;
  * The interface of store service
  *
  * @method ResultInterface deferGetEntrustedData(int $storeId, array $fields = [])
+ * @method ResultInterface deferGetEntrustedDataByMchid(int $mchid, array $fields = [])
+ * @method ResultInterface deferGetWxpayCerts(int $storeId, $mchid)
  */
 interface EntrustedInterface
 {
@@ -28,4 +30,22 @@ interface EntrustedInterface
      */
     public function getEntrustedData(int $storeId, array $fields = []);
     
+    /**
+     * 根据店铺id和商户平台id获取对应的支付证书
+     * 
+     * @param int $storeId
+     * @param string $mchid
+     * @return array
+     */
+    public function getWxpayCerts(int $storeId, $mchid);
+
+    /**
+     * 根据商户平台id获取对应的小程序托管配置
+     * 
+     * @param int $storeId
+     * @param array $fields  字段列表
+     * @return bool
+     */
+    public function getEntrustedDataByMchid(int $mchid, array $fields = []);
+
 }
\ No newline at end of file