Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/Common/Pool/Config/BuyerPoolConfig.php

src/Common/Pool/Config/GoodsPoolConfig.php

@@ -78,8 +78,7 @@ class GoodsPoolConfig extends PoolProperties
      * @var array
      * @var array
      */
      */
     protected $uri = [
     protected $uri = [
-        '172.21.0.9:8099',
-        '172.16.255.13:8099',
+	    '192.168.3.39:8400',
     ];
     ];
 
 
     /**
     /**

src/Common/Pool/Config/SellerDistributionPoolConfig.php

@@ -63,7 +63,7 @@ class SellerDistributionPoolConfig extends PoolProperties
      *
      *
      * @var int
      * @var int
      */
      */
-    protected $timeout = 5;
+    protected $timeout = 200;
 
 
     /**
     /**
      * the addresses of connection
      * the addresses of connection
@@ -78,8 +78,7 @@ class SellerDistributionPoolConfig extends PoolProperties
      * @var array
      * @var array
      */
      */
     protected $uri = [
     protected $uri = [
-        '172.21.0.46:8099',
-        '172.16.255.116:8099',
+        '192.168.3.39:8100',
     ];
     ];
 
 
     /**
     /**

src/Common/Pool/Config/SellerPoolConfig.php

@@ -63,7 +63,7 @@ class SellerPoolConfig extends PoolProperties
      *
      *
      * @var int
      * @var int
      */
      */
-    protected $timeout = 5;
+    protected $timeout = 200;
 
 
     /**
     /**
      * the addresses of connection
      * the addresses of connection
@@ -78,8 +78,7 @@ class SellerPoolConfig extends PoolProperties
      * @var array
      * @var array
      */
      */
     protected $uri = [
     protected $uri = [
-        '172.21.0.19:8099',
-        '172.16.255.30:8099',
+        '192.168.3.39:8099',
     ];
     ];
 
 
     /**
     /**

src/Common/Pool/Config/StorePoolConfig.php

@@ -63,7 +63,7 @@ class StorePoolConfig extends PoolProperties
      *
      *
      * @var int
      * @var int
      */
      */
-    protected $timeout = 5;
+    protected $timeout = 200;
 
 
     /**
     /**
      * the addresses of connection
      * the addresses of connection
@@ -78,8 +78,7 @@ class StorePoolConfig extends PoolProperties
      * @var array
      * @var array
      */
      */
     protected $uri = [
     protected $uri = [
-        '172.21.0.13:8098',
-        '172.16.255.191:8098',
+        '192.168.3.23:8098',
     ];
     ];
 
 
     /**
     /**

src/Common/Pool/Config/VipPoolConfig.php

@@ -63,7 +63,7 @@ class VipPoolConfig extends PoolProperties
      *
      *
      * @var int
      * @var int
      */
      */
-    protected $timeout = 5;
+    protected $timeout = 200;
 
 
     /**
     /**
      * the addresses of connection
      * the addresses of connection
@@ -78,8 +78,7 @@ class VipPoolConfig extends PoolProperties
      * @var array
      * @var array
      */
      */
     protected $uri = [
     protected $uri = [
-        '172.21.0.39:8200',
-        '172.16.255.134:8200',
+        '192.168.3.39:8200',
     ];
     ];
 
 
     /**
     /**

src/GroupBooking/Lib/GroupBookingInterface.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: Administrator
+ * Date: 2018/8/8
+ * Time: 10:43
+ */
+
+namespace Hdll\Services\GroupBooking\Lib;
+
+use Swoft\Core\ResultInterface;
+
+/**
+ * @method ResultInterface deferPaySuccess($orderId)
+ * Interface GoodsInterface
+ * @package Hdll\Services\Goods\Lib
+ */
+interface GroupBookingInterface{
+
+
+	public function paySuccess($orderId);
+
+}
\ No newline at end of file

src/Schedule/Lib/ScheduleInterface.php

@@ -16,10 +16,10 @@ use Swoft\Core\ResultInterface;
 /**
 /**
  * The interface of Schedule service
  * The interface of Schedule service
  *
  *
- * @method ResultInterface deferGetScheduleList(int $storeId, int $month=null)
- * @method ResultInterface deferGetScheduleByDateId(int $storeId, int $dateId)
- * @method ResultInterface deferUpdateSchedule(int $storeId, int $dateId, array $data)
- * @method ResultInterface deferAddSchedule(int $storeId, int $dateId, array $data)
+ * @method ResultInterface deferGetScheduleList(int $storeId, int $month, int $cmanId = 0)
+ * @method ResultInterface deferGetScheduleByDateId(int $storeId, int $dateId, int $cmanId = 0)
+ * @method ResultInterface deferUpdateSchedule(int $storeId, int $cmanId, int $dateId, array $data)
+ * @method ResultInterface deferAddSchedule(int $storeId, int $cmanId, int $dateId, array $data)
  */
  */
 interface ScheduleInterface
 interface ScheduleInterface
 {
 {
@@ -27,24 +27,26 @@ interface ScheduleInterface
      * 获取店铺所有日程列表
      * 获取店铺所有日程列表
      *
      *
      * @param integer $storeId
      * @param integer $storeId
-     * @param integer $month 可选参数 指定要查哪个月份的日程列表，格式如：201810
+     * @param integer $month 指定要查哪个月份的日程列表，格式如：201810
      * @return array 空数组表示没有查询到记录
      * @return array 空数组表示没有查询到记录
      */
      */
-    public function getScheduleList(int $storeId, int $month = null);
+    public function getScheduleList(int $storeId, int $month, int $cmanId = 0);
 
 
     /**
     /**
      * 获取某天的日程信息
      * 获取某天的日程信息
      *
      *
      * @param integer $storeId
      * @param integer $storeId
      * @param integer $dateId  要查询的日期id，格式要求如：20180803 
      * @param integer $dateId  要查询的日期id，格式要求如：20180803 
+     * @param integer $cmanId  手艺人ID，可查询指定手艺人的日程安排，为0时表示店铺级别的日程
      * @return array 空数组表示没有查询到记录
      * @return array 空数组表示没有查询到记录
      */
      */
-    public function getScheduleByDateId(int $storeId, int $dateId);
+    public function getScheduleByDateId(int $storeId, int $dateId, int $cmanId = 0);
 
 
     /**
     /**
      * 根据dateId修改某个日程的信息
      * 根据dateId修改某个日程的信息
      *
      *
      * @param integer $storeId
      * @param integer $storeId
+     * @param integer $cmanId  手艺人ID，可修改指定手艺人的日程安排，$cmanId==0 时表示修改店铺级别的日程
      * @param integer $dateId  要修改的日期id，格式要求如：20180803 
      * @param integer $dateId  要修改的日期id，格式要求如：20180803 
      * @param array $data
      * @param array $data
      * 参数 $data 字段说明：
      * 参数 $data 字段说明：
@@ -52,12 +54,13 @@ interface ScheduleInterface
      * 
      * 
      * @return int  成功更新的条数
      * @return int  成功更新的条数
      */
      */
-    public function updateSchedule(int $storeId, int $dateId, array $data);
+    public function updateSchedule(int $storeId, int $cmanId, int $dateId, array $data);
 
 
     /**
     /**
      * 添加一个日程安排
      * 添加一个日程安排
      *
      *
      * @param integer $storeId
      * @param integer $storeId
+     * @param integer $cmanId  手艺人ID，给指定的手艺人添加日程安排，$cmanId==0 时表示添加店铺级别的日程
      * @param integer $dateId  要添加的日期id，格式要求如：20180803 
      * @param integer $dateId  要添加的日期id，格式要求如：20180803 
      * @param array $data
      * @param array $data
      * 参数 $data 字段说明：
      * 参数 $data 字段说明：
@@ -65,5 +68,6 @@ interface ScheduleInterface
      * 
      * 
      * @return int 
      * @return int 
      */
      */
-    public function addSchedule(int $storeId, int $dateId, array $data);
+    public function addSchedule(int $storeId, int $cmanId, int $dateId, array $data);
+    
 }
 }
\ No newline at end of file

src/Seller/Lib/SellerFundInterface.php

@@ -13,12 +13,53 @@ use Swoft\Core\ResultInterface;
 /**
 /**
  *
  *
  * @method ResultInterface deferGetFund($sellerId)
  * @method ResultInterface deferGetFund($sellerId)
+ * @method ResultInterface deferAddBalance($sellerId)
+ * @method ResultInterface deferReduceBalance($sellerId)
+ * @method ResultInterface deferAddTotal($sellerId)
+ * @method ResultInterface deferReduceTotal($sellerId)
  * Interface SellerInterface
  * Interface SellerInterface
  * @package App\Lib
  * @package App\Lib
  */
  */
 interface SellerFundInterface
 interface SellerFundInterface
 {
 {
 
 
+
+	/**
+	 * 增加提现金额
+	 * @param $seller
+	 * @param $money
+	 * @return mixed
+	 * @author Administrator
+	 */
+	public function addBalance($seller, $money);
+
+	/**
+	 * 减少提现金额
+	 * @param $seller
+	 * @param $money
+	 * @return mixed
+	 * @author Administrator
+	 */
+	public function reduceBalance($seller, $money);
+
+	/**
+	 * 增加总提现金额
+	 * @param $seller
+	 * @param $money
+	 * @return mixed
+	 * @author Administrator
+	 */
+	public function addTotal($seller, $money);
+
+	/**
+	 * 减少总提现金额
+	 * @param $seller
+	 * @param $money
+	 * @return mixed
+	 * @author Administrator
+	 */
+	public function reduceTotal($seller, $money);
+
 	/**
 	/**
 	 *
 	 *
 	 * @param $sellerId
 	 * @param $sellerId

src/SellerDistribution/Lib/SellerDistributionInterface.php

@@ -11,6 +11,10 @@ use Swoft\Core\ResultInterface;
 /**
 /**
  * @method ResultInterface deferSaveBill($orderId, $sellerId, $money)
  * @method ResultInterface deferSaveBill($orderId, $sellerId, $money)
  * @method ResultInterface deferGetCommission($sellerId)
  * @method ResultInterface deferGetCommission($sellerId)
+ * method ResultInterface deferAddBalance($sellerId, $money)
+ * method ResultInterface deferReduceBalance($sellerId, $money)
+ * method ResultInterface deferAddTotal($sellerId, $money)
+ * method ResultInterface deferReduceTotal($sellerId, $money)
  * Interface SellerDistributionInterface
  * Interface SellerDistributionInterface
  * @package App\Lib
  * @package App\Lib
  */
  */
@@ -39,4 +43,40 @@ interface SellerDistributionInterface{
 	 * @author Administrator
 	 * @author Administrator
 	 */
 	 */
 	public function getCommission($sellerId);
 	public function getCommission($sellerId);
+
+	/**
+	 * 增加佣金
+	 * @param $sellerId
+	 * @param $money
+	 * @return mixed
+	 * @author Administrator
+	 */
+	public function addBalance($sellerId, $money);
+
+	/**
+	 * 减少佣金
+	 * @param $sellerId
+	 * @param $money
+	 * @return mixed
+	 * @author Administrator
+	 */
+	public function reduceBalance($sellerId, $money);
+
+	/**
+	 * 增加累计佣金
+	 * @param $sellerId
+	 * @param $money
+	 * @return mixed
+	 * @author Administrator
+	 */
+	public function addTotal($sellerId, $money);
+
+	/**
+	 * 减少累计佣金
+	 * @param $sellerId
+	 * @param $money
+	 * @return mixed
+	 * @author Administrator
+	 */
+	public function reduceTotal($sellerId, $money);
 }
 }
\ No newline at end of file