Merge branch 'ft-reservation' into test

UPGRADE_2.x.md

+# 2.0.50
+- 修改cos-sdk-v5版本
+
+# 2.0.49
+- oem部署上线
+
+# 2.0.48
+- 卖家oem
+
+# 2.0.47
+- 修改获取店铺信息的接口
+
 # 2.0.46
 - 修复发通知bug
 

src/Goods/Lib/GoodsInterface.php

@@ -108,7 +108,7 @@ interface GoodsInterface
 	 * @return mixed
 	 * @author Administrator
 	 */
-	public function listByIds(array $ids, $storeId, $order = ['id', 'DESC']);
+	public function listByIds(array $ids, $storeId, $order = ['id', 'DESC'], $type = '');
 
 	/**
 	 * 获取sku信息
@@ -194,8 +194,8 @@ interface GoodsInterface
 	 * 减少库存
 	 * @param $storeId
 	 * @param $goods = [
-	 *        商品       goodsId=>num,
-	 *        sku       goodsId=>[skuId=>num]
+	 *               商品       goodsId=>num,
+	 *               sku       goodsId=>[skuId=>num]
 	 *               ]
 	 */
 	public function reduceStock($storeId, $goods);
@@ -204,8 +204,8 @@ interface GoodsInterface
 	 * 增加库存
 	 * @param $storeId
 	 * @param $goods =[
-	 *        商品       goodsId=>num,
-	 *        sku       goodsId=>[skuId=>num]
+	 *               商品       goodsId=>num,
+	 *               sku       goodsId=>[skuId=>num]
 	 *               ]
 	 */
 	public function addStock($storeId, $goods);

src/Store/Lib/StoreInterface.php

@@ -17,9 +17,9 @@ use Swoft\Core\ResultInterface;
  *
  * @method ResultInterface deferIsCertified(int $storeId)
  * @method ResultInterface deferIsNormal(int $storeId)
- * @method ResultInterface deferGetStoreByStoreId(int $storeId)
- * @method ResultInterface deferGetStoreByStoreName(string $storeName)
- * @method ResultInterface deferGetStoreBySellerId(int $sellerId)
+ * @method ResultInterface deferGetStoreByStoreId(int $storeId, array $fields=[])
+ * @method ResultInterface deferGetStoreByStoreName(string $storeName, array $fields=[])
+ * @method ResultInterface deferGetStoreBySellerId(int $sellerId, array $fields=[])
  * @method ResultInterface deferGetListBySellerIds(array $sellerIds, array $fields = [])
  * @method ResultInterface deferGetListByStoreIds(array $storeIds, array $fields = [])
  * @method ResultInterface deferGetListByLastMonth()
@@ -54,7 +54,7 @@ interface StoreInterface
      * @param integer $storeId
      * @return array 空数组表示没有查询到记录
      */
-    public function getStoreByStoreId(int $storeId);
+    public function getStoreByStoreId(int $storeId, array $fields=[]);
 
     /**
      * 根据店铺名称获取店铺信息
@@ -62,7 +62,7 @@ interface StoreInterface
      * @param string $storeName
      * @return array
      */
-    public function getStoreByStoreName(string $storeName);
+    public function getStoreByStoreName(string $storeName, array $fields=[]);
 
     /**
      * 根据卖家ID获取店铺信息
@@ -70,7 +70,7 @@ interface StoreInterface
      * @param integer $sellerId
      * @return array
      */
-    public function getStoreBySellerId(int $sellerId);
+    public function getStoreBySellerId(int $sellerId, array $fields=[]);
 
     /**
      * 根据卖家ID列表获取店铺信息列表