Merge branch 'master' into test

UPGRADE_2.x.md

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

src/Common/Config/CfgCenter.php

@@ -22,6 +22,7 @@ class CfgCenter
 	const PAY_KUANYUAN   = 'pay_kuanyuan'; //宽元的支付平台配置
 	const PAY_KUANYUAN   = 'pay_kuanyuan'; //宽元的支付平台配置
 	const PAY_YUNMAI_ISP = 'pay_yunmai_isp'; //云脉的支付服务商配置，用于托管子商户
 	const PAY_YUNMAI_ISP = 'pay_yunmai_isp'; //云脉的支付服务商配置，用于托管子商户
 	const PAY_ZHIMEI     = 'pay_zhimei'; //致美的支付配置
 	const PAY_ZHIMEI     = 'pay_zhimei'; //致美的支付配置
+	const PAY_TRANSFER   = 'pay_transfer'; //提现打款专用的支付配置
 	const SELLER_DISTRIBUTION = 'seller_distribution'; //卖家分销配置
 	const SELLER_DISTRIBUTION = 'seller_distribution'; //卖家分销配置
 	const MP_ZHIMEI      = 'mp_zhimei'; //致美的公众号配置
 	const MP_ZHIMEI      = 'mp_zhimei'; //致美的公众号配置
 	const MP_OEMADM      = 'mp_oemadm'; // OEM机构管理员公众号后台，使用云脉科技公众号
 	const MP_OEMADM      = 'mp_oemadm'; // OEM机构管理员公众号后台，使用云脉科技公众号

src/Craftsman/Lib/CraftsmanInterface.php

@@ -23,6 +23,7 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferGetCraftsmenByIds(int $storeId, array $cmanIds)
  * @method ResultInterface deferGetCraftsmenByIds(int $storeId, array $cmanIds)
  * @method ResultInterface deferSyncItems(int $storeId, array $itemIds, int $mode)
  * @method ResultInterface deferSyncItems(int $storeId, array $itemIds, int $mode)
  * @method ResultInterface deferUpdateCmanByUnionId(string $unionId, int $storeId, array $data)
  * @method ResultInterface deferUpdateCmanByUnionId(string $unionId, int $storeId, array $data)
+ * @method ResultInterface deferGetSellerCraftsman(int $storeId, array $fields = [])
  */
  */
 interface CraftsmanInterface
 interface CraftsmanInterface
 {
 {
@@ -78,6 +79,14 @@ interface CraftsmanInterface
      */
      */
     public function getCraftsmenByUnionId(string $unionId, int $isSeller =0);
     public function getCraftsmenByUnionId(string $unionId, int $isSeller =0);
 
 
+    /**
+     * 获取该店铺下的卖家身份的店员
+     *
+     * @param integer $storeId
+     * @param array $fields
+     * @return array
+     */
+    public function getSellerCraftsman(int $storeId, array $fields = []);
     
     
     /**
     /**
      * 根据店铺Id和店员Id获取店员信息
      * 根据店铺Id和店员Id获取店员信息

src/Store/Lib/StoreInterface.php

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