Merge branch 'master' into test

UPGRADE_2.x.md

+# 2.0.57
+- 顾客档案添加接口getProfile
+
+# 2.0.56
+- oem vip 套餐
+
 # 2.0.55
 # 2.0.55
 - 修复根据卖家id读取配置的错误
 - 修复根据卖家id读取配置的错误
 
 

src/Common/Config/CfgCenter.php

@@ -23,6 +23,7 @@ class CfgCenter
 	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 PAY_TRANSFER   = 'pay_transfer'; //提现打款专用的支付配置
+	const PAY_YUNMAIKEJI = 'pay_yunmaikeji'; // 云脉科技支付
 	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/CustomerProfiles/Lib/ProfileInterface.php

@@ -18,6 +18,7 @@ use Swoft\Core\ResultInterface;
  *
  *
  * @method  ResultInterface deferAddOrder($storeId, $orderId, $goodsId, $goodsName, $orderPrice, $orderType, $orderTime, $consigneeName, $consigneePhone, $buyerId,$activityName)
  * @method  ResultInterface deferAddOrder($storeId, $orderId, $goodsId, $goodsName, $orderPrice, $orderType, $orderTime, $consigneeName, $consigneePhone, $buyerId,$activityName)
  * @method  ResultInterface deferSinceAddVisitor(int $storeId, int $buyerId, int $time)
  * @method  ResultInterface deferSinceAddVisitor(int $storeId, int $buyerId, int $time)
+ * @method  ResultInterface deferGetProfile($storeId, $buyerId)
  */
  */
 interface ProfileInterface
 interface ProfileInterface
 {
 {
@@ -42,4 +43,12 @@ interface ProfileInterface
      */
      */
     public function sinceAddVisitor(int $storeId, int $buyerId, int $time);
     public function sinceAddVisitor(int $storeId, int $buyerId, int $time);
 
 
+    /**
+     * 获取买家信息
+     * @param $storeId  // 店铺id
+     * @param $buyerId  // 卖家id
+     * @return mixed
+     */
+    public function getProfile($storeId, $buyerId);
+
 }
 }
\ No newline at end of file