Merge remote-tracking branch 'origin/test' into test

src/ActivityPlan/Lib/ActivityPlanInterface.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: Administrator
+ * Date: 2018/7/27
+ * Time: 16:28
+ */
+
+namespace Hdll\Services\ActivityPlan\Lib;
+
+use Swoft\Core\ResultInterface;
+
+/**
+ * @method ResultInterface deferGetInfo(int $id)
+ * Interface VisitorInterface
+ * @package App\Lib
+ */
+interface ActivityPlanInterface
+{
+
+    /**
+     * 根据id获取活动方案
+     * @return mixed
+     */
+	public function getInfo(int $id);
+
+}
\ No newline at end of file

src/Common/Pool/Config/ActivityPlanPoolConfig.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 ActivityPlanPoolConfig extends PoolProperties
+{
+
+	public function __construct()
+	{
+		// 区别本地和线上的RPC服务地址
+		$this->uri = explode(',', env('RPC_ACTIVITYPLAN_URI', 'activity-plan:8099'));
+	}
+
+    protected $name = 'activity-plan';
+
+    /**
+     * 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/Order/Enum/OrderItemEnum.php

@@ -20,4 +20,5 @@ class OrderItemEnum
     //核销方式
     //核销方式
     const DELIVERED_BTN = 1; //按钮核销
     const DELIVERED_BTN = 1; //按钮核销
     const DELIVERED_CODE = 2; //扫码核销
     const DELIVERED_CODE = 2; //扫码核销
+    const DELIVERED_AUTO = 3;//自动核销/收货
 }
 }
\ No newline at end of file