Merge branch 'master' of http://git.2b3.cn/tencent/services

# Conflicts:
#	src/Common/Pool/Config/BuyerPoolConfig.php
#	src/Common/Pool/Config/SellerDistributionPoolConfig.php
#	src/Common/Pool/Config/SellerPoolConfig.php
#	src/Common/Pool/Config/VipPoolConfig.php
#	src/Order/Lib/OrderInterface.php

src/Common/Pool/Config/BuyerPoolConfig.php

@@ -75,7 +75,8 @@ class BuyerPoolConfig extends PoolProperties
      *
      *
      */
      */
     protected $uri = [
     protected $uri = [
-        "192.168.3.100:8101"
+        "172.21.0.2:8099",
+        "172.16.255.174:8099"
 
 
     ];
     ];
 
 

src/Order/Lib/OrderInterface.php

@@ -16,13 +16,13 @@ use Swoft\Core\ResultInterface;
  * The interface of demo service
  * The interface of demo service
  *
  *
  * @method ResultInterface deferCreateOrder(  string $token,int $consignee_id,int $activity_id,int $selected_num,int $order_type,float $total,float $goods_price,string $goods_name,string $goods_image,string $activity_name,string $reservation_time = '')
  * @method ResultInterface deferCreateOrder(  string $token,int $consignee_id,int $activity_id,int $selected_num,int $order_type,float $total,float $goods_price,string $goods_name,string $goods_image,string $activity_name,string $reservation_time = '')
- * @method ResultInterface deferGetOrderInfo(int $storeId,int $orderId)
  */
  */
 interface OrderInterface
 interface OrderInterface
 {
 {
     /**
     /**
      * 创建订单
      * 创建订单
-     * @param string $token
+     * @param int $buyerId
+     * @param int $storeId
      * @param int $consignee_id
      * @param int $consignee_id
      * @param int $item_id
      * @param int $item_id
      * @param int $selected_num
      * @param int $selected_num
@@ -36,7 +36,8 @@ interface OrderInterface
      * @return mixed
      * @return mixed
      */
      */
     public function createOrder(
     public function createOrder(
-        string $token,
+        int $buyerId,
+        int $storeId,
         int $consignee_id,
         int $consignee_id,
         int $item_id,
         int $item_id,
         int $selected_num,
         int $selected_num,

src/Pay/Lib/PayInterface.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: Administrator
+ * Date: 2018/8/9
+ * Time: 13:44
+ */
+namespace Hdll\Services\Pay\Lib;
+
+use Swoft\Core\ResultInterface;
+
+/**
+ * @method ResultInterface deferCreateOrder(int $storeId, int $orderId, int $openId)
+ * Interface PayInterface
+ * @package Hdll\Services\Pay\Lib
+ */
+interface PayInterface
+{
+    public function generateSign(int $storeId, int $orderId, int $openId);
+}