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

src/ApiService/Lib/OemInterface.php

+<?php
+
+
+namespace Hdll\Services\ApiService\Lib;
+
+use Swoft\Core\ResultInterface;
+
+/**
+ * Interface OemInterface
+ * @package Hdll\Services\Lib\ApiService
+ */
+interface OemInterface
+{
+
+	/**
+	 * 获取oem信息
+	 * @param $oemId
+	 * @return mixed
+	 */
+	public function getOem($oemId);
+}
\ No newline at end of file

src/Common/Pool/Config/ApiServicePoolConfig.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 ApiServicePoolConfig extends PoolProperties
+{
+	public function __construct()
+	{
+		// 区别本地和线上的RPC服务地址
+//		$this->uri = explode(',', env('RPC_GROUPBOOKING_URI', '172.21.0.38:8099,172.16.255.27:8099'));
+		$this->uri = explode(',', env('RPC_API_SERVICE_URI', 'apiService:8099'));
+	}
+
+	protected $name = 'apiService';
+
+	/**
+	 * Minimum active number of connections
+	 *
+	 * @var int
+	 */
+	protected $minActive = 5;
+
+	/**
+	 * the maximum number of active connections
+	 *
+	 * @var int
+	 */
+	protected $maxActive = 300;
+
+	/**
+	 * the maximum number of wait connections
+	 *
+	 * @var int
+	 */
+	protected $maxWait = 400;
+
+	/**
+	 * 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:8200',
+	];
+
+	/**
+	 * 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/MemberCard/Lib/MemberCardInterface.php

@@ -130,8 +130,8 @@ interface MemberCardInterface
    * @param integer $storeId
    * @param integer $storeId
    * @param integer $userId
    * @param integer $userId
    * @param integer $orderId
    * @param integer $orderId
-   * @param integer $type   //类型 1 消费产生积分 2 积分抵扣 3订单关闭 （这里只要传1-3）【4 - 消费后订单关闭，原来增加积分的记录状态为4（1->4）】
-   * @param integer $money  //类型1 只要传money，bonus不传；  类型2 money，bonus 都传；   类型3 积分，金额都不传
+   * @param integer $type   //类型 1 消费产生积分 2 积分抵扣 3订单关闭 （这里只要传1-3)  枚举见 UpBonusEvent
+   * @param integer $money  //类型1 只要传money，bonus不传；  类型2 money=0，bonus 传；   类型3 money，bonus都不传
    * @param integer $bonus
    * @param integer $bonus
    * @return bool
    * @return bool
    */
    */

src/Vip/Lib/OemVipInterface.php

+<?php
+
+
+namespace Hdll\Services\Vip\Lib;
+
+use Swoft\Core\ResultInterface;
+
+/**
+ *
+ * Interface OemVipInterface
+ * @package Hdll\Services\Vip\Lib
+ */
+interface OemVipInterface
+{
+
+	public function getOrder($id);
+}
\ No newline at end of file