Merge remote-tracking branch 'origin/master'

src/BuyerDistribution/Enum/DistributionEnum.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: Administrator
+ * Date: 2018/9/18
+ * Time: 13:58
+ */
+namespace Hdll\Services\BuyerDistribution\Enum;
+
+class DistributionEnum
+{
+    const STATE_BALANCE_FALSE = 0; //未入账
+
+    const STATE_BALANCE_TRUE = 1; //已入账
+
+}
\ No newline at end of file

src/Common/Pool/Config/AuthPoolConfig.php

@@ -69,7 +69,7 @@ class AuthPoolConfig extends PoolProperties
      * the time of connect timeout
      *
      */
-    protected $timeout = 5;
+    protected $timeout = 200;
 
     /**
      * the addresses of connection

src/Common/Pool/Config/BargainPoolConfig.php

@@ -71,7 +71,7 @@ class BargainPoolConfig extends PoolProperties
      *
      * @var int
      */
-    protected $timeout = 5;
+    protected $timeout = 200;
 
     /**
      * the addresses of connection

src/Common/Pool/Config/BuyerPoolConfig.php

@@ -68,7 +68,7 @@ class BuyerPoolConfig extends PoolProperties
      * the time of connect timeout
      *
      */
-    protected $timeout = 5;
+    protected $timeout = 200;
 
     /**
      * the addresses of connection

src/Common/Pool/Config/GoodsPoolConfig.php

@@ -70,7 +70,7 @@ class GoodsPoolConfig extends PoolProperties
      *
      * @var int
      */
-    protected $timeout = 5;
+    protected $timeout = 200;
 
     /**
      * the addresses of connection

src/Common/Pool/Config/GroupBookingPoolConfig.php

@@ -69,7 +69,7 @@ class GroupBookingPoolConfig extends PoolProperties
      *
      * @var int
      */
-    protected $timeout = 5;
+    protected $timeout = 200;
 
     /**
      * the addresses of connection

src/Common/Pool/Config/NoticePoolConfig.php

@@ -67,7 +67,7 @@ class NoticePoolConfig extends PoolProperties
      * the time of connect timeout
      *
      */
-    protected $timeout = 50;
+    protected $timeout = 200;
 
     /**
      * the addresses of connection

src/Common/Pool/Config/OrderPoolConfig.php

@@ -33,7 +33,7 @@ class OrderPoolConfig extends PoolProperties
      *
      * @var int
      */
-    protected $minActive = 5;
+    protected $minActive = 15;
 
     /**
      * the maximum number of active connections

src/Common/Pool/Config/PayPoolConfig.php

@@ -67,7 +67,7 @@ class PayPoolConfig extends PoolProperties
      * the time of connect timeout
      *
      */
-    protected $timeout = 50;
+    protected $timeout = 200;
 
     /**
      * the addresses of connection

src/Common/Pool/Config/ReservationPoolConfig.php

@@ -68,7 +68,7 @@ class ReservationPoolConfig extends PoolProperties
      *
      * @var int
      */
-    protected $timeout = 15;
+    protected $timeout = 200;
 
     /**
      * the addresses of connection

src/Common/Pool/Config/SchedulePoolConfig.php

@@ -68,7 +68,7 @@ class SchedulePoolConfig extends PoolProperties
      *
      * @var int
      */
-    protected $timeout = 15;
+    protected $timeout = 200;
 
     /**
      * the addresses of connection

src/Common/Pool/Config/SellerDistributionPoolConfig.php

@@ -70,7 +70,7 @@ class SellerDistributionPoolConfig extends PoolProperties
      *
      * @var int
      */
-    protected $timeout = 5;
+    protected $timeout = 200;
 
     /**
      * the addresses of connection

src/Common/Pool/Config/SellerPoolConfig.php

@@ -69,7 +69,7 @@ class SellerPoolConfig extends PoolProperties
      *
      * @var int
      */
-    protected $timeout = 5;
+    protected $timeout = 200;
 
     /**
      * the addresses of connection

src/Common/Pool/Config/StateLessPoolConfig.php

@@ -66,7 +66,7 @@ class StateLessPoolConfig extends PoolProperties
      *
      * @var int
      */
-    protected $timeout = 5;
+    protected $timeout = 200;
 
     /**
      * the addresses of connection

src/Common/Pool/Config/StorePoolConfig.php

@@ -68,7 +68,7 @@ class StorePoolConfig extends PoolProperties
      *
      * @var int
      */
-    protected $timeout = 15;
+    protected $timeout = 200;
 
     /**
      * the addresses of connection

src/Common/Pool/Config/TimeLimitBuyPoolConfig.php

@@ -23,7 +23,7 @@ class TimeLimitBuyPoolConfig extends PoolProperties
     {
         // 区别本地和线上的RPC服务地址
 
-        $this->uri = explode(',', env('RPC_TIMELIMITBUY_URI', 'timelistbuy:8099'));
+        $this->uri = explode(',', env('RPC_TIMELIMITBUY_URI', 'timelimitbuy:8099'));
     }
     protected $name = 'timelimitname';
 
@@ -68,7 +68,7 @@ class TimeLimitBuyPoolConfig extends PoolProperties
      *
      * @var int
      */
-    protected $timeout = 5;
+    protected $timeout = 200;
 
     /**
      * the addresses of connection

src/Common/Pool/Config/TransferPoolConfig.php

@@ -67,7 +67,7 @@ class TransferPoolConfig extends PoolProperties
      *
      * @var int
      */
-    protected $timeout = 5;
+    protected $timeout = 200;
 
     /**
      * the addresses of connection

src/Common/Pool/Config/VipPoolConfig.php

@@ -70,7 +70,7 @@ class VipPoolConfig extends PoolProperties
      *
      * @var int
      */
-    protected $timeout = 5;
+    protected $timeout = 200;
 
     /**
      * the addresses of connection

src/Common/Pool/Config/WithdrawCashPoolConfig.php

@@ -67,7 +67,7 @@ class WithdrawCashPoolConfig extends PoolProperties
      *
      * @var int
      */
-    protected $timeout = 5;
+    protected $timeout = 200;
 
     /**
      * the addresses of connection

src/Goods/Enum/AuthEnum.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: Administrator
+ * Date: 2018/8/20
+ * Time: 15:48
+ */
+
+namespace App\Enum;
+
+class AuthEnum
+{
+
+	const EVERYONE = 0;//任何人
+	const BUYER = 1;//买家
+	const CRAFTSMAN = 2;//手艺人
+	const SELLER = 3;//卖家
+	const ADMIN = 4;//管理员
+}
\ No newline at end of file

src/Goods/Enum/GoodEnum.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: Administrator
+ * Date: 2018/7/26
+ * Time: 16:00
+ */
+namespace App\Enum;
+
+class GoodEnum{
+	const ON_OFFER = 0;//出售中
+	const SOLD_OUT = 1;//下架
+	const SELL_OUT = 2;//售完
+}
\ No newline at end of file

src/Goods/Enum/GoodsEvaluateEnum.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: Administrator
+ * Date: 2018/7/26
+ * Time: 16:00
+ */
+namespace App\Enum;
+
+class GoodsEvaluateEnum{
+	const GOOD = 1;//好评
+	const MEDIUM = 2;//中评
+	const BAD = 3;//差评
+}
\ No newline at end of file

src/Goods/Enum/StarEnum.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: Administrator
+ * Date: 2018/7/26
+ * Time: 16:00
+ */
+
+namespace App\Enum;
+
+class StarEnum
+{
+	const STAR = 1;//点赞
+	const CANCEL = 2;//取消点赞
+
+	const HAS_START_KEY = 'hasStar';
+	const STAR_KEY = 'star';
+}
\ No newline at end of file

src/Order/Enum/OrderEnum.php

@@ -30,6 +30,10 @@ class OrderEnum
     const TYPE_LIMIT = 2; //限时购订单
     const TYPE_COLLECTION = 3; //拼团
 
+
+    //对账锁定
+    const LOCK = 1; //订单锁定
+
     const ORDER_TYPES = [
         self::TYPE_GOODS,
         self::TYPE_CUT_PRICE,