Merge branch 'v3' into test

UPGRADE_2.x.md

+# 2.0.17
+- 配合前端v2版本上线
+
+# 2.0.16
+- 修复bug
+
+# 2.0.15
+- 分成比例修改
+
 # 2.0.14
 # 2.0.14
 - Cls记日志忽略‘验证器不存在’的日志
 - Cls记日志忽略‘验证器不存在’的日志
 
 
@@ -8,7 +17,8 @@
 - 配合前端改版后端大调整
 - 配合前端改版后端大调整
 
 
 # 2.0.11
 # 2.0.11
-- 砍价订单枚举状态加订单删除
+- 关闭拼团活动状态
+ 砍价订单枚举状态加订单删除
 
 
 # 2.0.10
 # 2.0.10
 - 根据商户平台id获取对应的小程序托管配置
 - 根据商户平台id获取对应的小程序托管配置

src/Seller/Lib/SellerInterface.php

@@ -18,7 +18,7 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferUpdate($id, $data)
  * @method ResultInterface deferUpdate($id, $data)
  * @method ResultInterface deferCountDistributionNum($sellerId)
  * @method ResultInterface deferCountDistributionNum($sellerId)
  * @method ResultInterface deferGetByIds(array $ids, $fields = ['*'])
  * @method ResultInterface deferGetByIds(array $ids, $fields = ['*'])
- * @method ResultInterface deferGetAndUpdateOpenId($unionId, $openId)
+ * @method ResultInterface deferGetAndUpdateOpenId($unionId, $openId, $fields = ['*'])
  * @method ResultInterface deferSaveRelation($sellerId)
  * @method ResultInterface deferSaveRelation($sellerId)
  * @method ResultInterface deferUpdateRelationVip($sellerId, $isVip)
  * @method ResultInterface deferUpdateRelationVip($sellerId, $isVip)
  * @method ResultInterface deferCountVip($sellerId, $isVip)
  * @method ResultInterface deferCountVip($sellerId, $isVip)
@@ -87,7 +87,7 @@ interface SellerInterface
 
 
 	public function getByIds(array $ids, $fields = ['*']);
 	public function getByIds(array $ids, $fields = ['*']);
 
 
-	public function getAndUpdateOpenId($unionId, $openId);
+	public function getAndUpdateOpenId($unionId, $openId, $fields = ['*']);
 
 
 	public function saveRelation($sellerId);
 	public function saveRelation($sellerId);