Merge branch 'test' of http://git.dev.2b3.cn/tencent/services into xmy

UPGRADE.md

+
 # 1.0.81
 - 添加订单服务店主核销枚举
 

src/Common/Pool/Config/FlowCountPoolConfig.php

+<?php
+/**
+ * This file is part of Swoft.
+ *
+ * @link https://swoft.org
+ * @document https://doc.swoft.org
+ * @contact group@swoft.org
+ * @license https://github.com/swoft-cloud/swoft/blob/master/LICENSE
+ */
+
+namespace Hdll\Services\Common\Pool\Config;
+
+use Swoft\Bean\Annotation\Bean;
+use Swoft\Pool\PoolProperties;
+
+/**
+ * the config of service user
+ *
+ * @Bean()
+ */
+class FlowCountPoolConfig extends PoolProperties
+{
+
+	public function __construct()
+	{
+		// 区别本地和线上的RPC服务地址
+		$this->uri = explode(',', env('RPC_FLOWCOUNT_URI', 'flowcount:8099'));
+	}
+
+    protected $name = 'flowcount';
+
+    /**
+     * Minimum active number of connections
+     *
+     * @var int
+     */
+    protected $minActive = 5;
+
+    /**
+     * the maximum number of active connections
+     *
+     * @var int
+     */
+    protected $maxActive = 400;
+
+    /**
+     * the maximum number of wait connections
+     *
+     * @var int
+     */
+    protected $maxWait = 500;
+
+    /**
+     * Maximum waiting time
+     *
+     * @var int
+     */
+    protected $maxWaitTime = 3;
+
+    /**
+     * Maximum idle time
+     *
+     * @var int
+     */
+    protected $maxIdleTime = 60;
+
+    /**
+     * the time of connect timeout
+     *
+     * @var int
+     */
+    protected $timeout = 200;
+
+    /**
+     * the addresses of connection
+     *
+     * <pre>
+     * [
+     *  '127.0.0.1:88',
+     *  '127.0.0.1:88'
+     * ]
+     * </pre>
+     *
+     * @var array
+     */
+    protected $uri = [
+        '192.168.3.39:8099'
+    ];
+
+    /**
+     * whether to user provider(consul/etcd/zookeeper)
+     *
+     * @var bool
+     */
+    protected $useProvider = false;
+
+    /**
+     * the default balancer is random balancer
+     *
+     * @var string
+     */
+    protected $balancer = '';
+
+    /**
+     * the default provider is consul provider
+     *
+     * @var string
+     */
+    protected $provider = '';
+}

src/FlowCount/Lib/VisitorInterface.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: Administrator
+ * Date: 2018/7/27
+ * Time: 16:28
+ */
+
+namespace Hdll\Services\FlowCount\Lib;
+
+use Swoft\Core\ResultInterface;
+
+/**
+ * @method ResultInterface deferAdd(array $data)
+ * Interface VisitorInterface
+ * @package App\Lib
+ */
+interface VisitorInterface
+{
+
+    /**
+     * 添加访客
+     * @param array $data
+     * int $data['storeId']=> 商家id
+     * int $data['visitorId']=>访客id
+     * int $data['date']=>访问时间
+     * int $data['appType']=>访问的app类型   默认传值：1前台小程序，2后台小程序
+     * string $data['nickName']=>'访客昵称'
+     * string $data['headImgUrl']=>'访客头像URL'
+     * @return mixed
+     */
+	public function add(array $data);
+
+}
\ No newline at end of file

src/Store/Lib/StoreInterface.php

@@ -18,6 +18,7 @@ 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 deferGetListBySellerIds(array $sellerIds, array $fields = [])
  * @method ResultInterface deferGetStoreByMobile(int $mobile, array $fields = [])
@@ -53,6 +54,14 @@ interface StoreInterface
     public function getStoreByStoreId(int $storeId);
 
     /**
+     * 根据店铺名称获取店铺信息
+     *
+     * @param string $storeName
+     * @return array
+     */
+    public function getStoreByStoreName(string $storeName);
+
+    /**
      * 根据卖家ID获取店铺信息
      *
      * @param integer $sellerId