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

src/Bargain/Lib/BargainInterface.php

@@ -22,14 +22,13 @@ interface BargainInterface
 {
 {
 
 
 
 
-
     /**
     /**
      *  获取砍价商品的 商品信息
      *  获取砍价商品的 商品信息
      * @param int $bargain_id
      * @param int $bargain_id
      * @return mixed
      * @return mixed
      */
      */
     public function getgoodsinfo(
     public function getgoodsinfo(
-        int $bargain_id
+       int $stordId,int $bargain_id
     );
     );
 
 
 }
 }
\ No newline at end of file

src/Buyer/Lib/CommissionInterface.php

@@ -33,4 +33,14 @@ interface CommissionInterface
      */
      */
     public function addBalanceCommission($storeId, $buyerId, $money);
     public function addBalanceCommission($storeId, $buyerId, $money);
 
 
+    /**
+     * 增加累计现金额
+     *
+     * @param $storeId
+     * @param $buyerId
+     * @param $money
+     * @return bool
+     */
+    public function addTotalCommission($storeId, $buyerId, $money);
+
 }
 }
\ No newline at end of file

src/Common/Entity/User.php

@@ -28,7 +28,7 @@ use Swoft\Redis\Redis;
  */
  */
 class User
 class User
 {
 {
-    private $id;
+    private $id=2;
 
 
     private $nickname;
     private $nickname;
 
 
@@ -36,7 +36,7 @@ class User
 
 
     private $headImg;
     private $headImg;
 
 
-    private $token;
+    private $token="3333E";
 
 
     private $cmId;
     private $cmId;
 
 

src/Common/Pool/Config/TimelimitbuyPoolConfig.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;
+
+/**
+ * @Bean()
+ * the config of service bargain
+ */
+class TimelimitbuyPoolConfig extends PoolProperties
+{
+    protected $name = 'bargain';
+
+    /**
+     * Minimum active number of connections
+     *
+     * @var int
+     */
+    protected $minActive = 5;
+
+    /**
+     * the maximum number of active connections
+     *
+     * @var int
+     */
+    protected $maxActive = 50;
+
+    /**
+     * the maximum number of wait connections
+     *
+     * @var int
+     */
+    protected $maxWait = 100;
+
+    /**
+     * 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 = 5;
+
+    /**
+     * the addresses of connection
+     *
+     * <pre>
+     * [
+     *  '127.0.0.1:88',
+     *  '127.0.0.1:88'
+     * ]
+     * </pre>
+     * @Value(name="", env="${RPC_BARGAIN_URI}")
+     * @var array
+     */
+    protected $uri = [
+        '172.21.0.34:8099',
+        '172.16.255.241: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/LimitTimeBuy/Lib/LimitTimeBuyInterface.php

@@ -39,8 +39,7 @@ interface LimitTimeBuyInterface
         int $selected_num,
         int $selected_num,
         int $order_type,
         int $order_type,
         int $goods_id,
         int $goods_id,
-        string $reservation_time = '');
-
+        string $reservation_time );
 
 
     /**
     /**
      *  获取限时购商品的 商品信息
      *  获取限时购商品的 商品信息
@@ -48,7 +47,5 @@ interface LimitTimeBuyInterface
      * @return mixed
      * @return mixed
      */
      */
     public function getLimitgoods(
     public function getLimitgoods(
-        int $limit_id
-    );
-
+        int $sellerId,int $limitId
+    );}
\ No newline at end of file
-}
\ No newline at end of file

src/Order/Enum/OrderEnum.php

@@ -26,7 +26,7 @@ class OrderEnum
     const TYPE_GOODS = 0; //商品订单
     const TYPE_GOODS = 0; //商品订单
     const TYPE_CUT_PRICE = 1; //砍价订单
     const TYPE_CUT_PRICE = 1; //砍价订单
     const TYPE_LIMIT = 2; //限时购订单
     const TYPE_LIMIT = 2; //限时购订单
-    const TYPE_COLLECTION = 3; //限时购订单
+    const TYPE_COLLECTION = 3; //拼团
 
 
     //对账状态
     //对账状态
      const BALANCE_STATE_FALSE = 0; //未对账
      const BALANCE_STATE_FALSE = 0; //未对账