Merge remote-tracking branch 'origin/master'

src/Buyer/Lib/BuyerInterface.php

@@ -12,6 +12,7 @@ use Swoft\Core\ResultInterface;
 /**
 /**
  * @method  ResultInterface deferGetUser(string $token)
  * @method  ResultInterface deferGetUser(string $token)
  * @method  ResultInterface deferUpdateProfile(string $token, array $data)
  * @method  ResultInterface deferUpdateProfile(string $token, array $data)
+ * @method  ResultInterface deferSelectUser(int $storeId, array $buyerIds, array $fields= ['*'])
  * Interface BuyerInterface
  * Interface BuyerInterface
  * @package App\Lib
  * @package App\Lib
  */
  */
@@ -77,4 +78,6 @@ interface BuyerInterface
         }
         }
      */
      */
     public function hasUser($storeId,$unionid);
     public function hasUser($storeId,$unionid);
+
+    public function selectUser(int $storeId, array $buyerIds, array $fields= ['*']);
 }
 }
\ No newline at end of file

src/Common/Pool/Config/SellerPoolConfig.php

@@ -41,14 +41,14 @@ class SellerPoolConfig extends PoolProperties
      *
      *
      * @var int
      * @var int
      */
      */
-    protected $maxActive = 300;
+    protected $maxActive = 400;
 
 
     /**
     /**
      * the maximum number of wait connections
      * the maximum number of wait connections
      *
      *
      * @var int
      * @var int
      */
      */
-    protected $maxWait = 400;
+    protected $maxWait = 500;
 
 
     /**
     /**
      * Maximum waiting time
      * Maximum waiting time

src/Goods/Lib/GoodsInterface.php

@@ -16,7 +16,7 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferDecSales($storeId, $goodsId)
  * @method ResultInterface deferDecSales($storeId, $goodsId)
  * @method ResultInterface deferGetServiceByGoodsId($storeId, $goodsId)
  * @method ResultInterface deferGetServiceByGoodsId($storeId, $goodsId)
  * @method ResultInterface deferGetReturnVisitByGoodsId($storeId, $goodsId)
  * @method ResultInterface deferGetReturnVisitByGoodsId($storeId, $goodsId)
- * @method ResultInterface deferListByIds($ids, $storeId, $order)
+ * @method ResultInterface deferListByIds($ids, $storeId)
  * Interface GoodsInterface
  * Interface GoodsInterface
  * @package Hdll\Services\Goods\Lib
  * @package Hdll\Services\Goods\Lib
  */
  */
@@ -93,5 +93,5 @@ interface GoodsInterface
 	 * @return mixed
 	 * @return mixed
 	 * @author Administrator
 	 * @author Administrator
 	 */
 	 */
-	public function ListByIds(array $ids, $storeId, $order);
+	public function listByIds(array $ids, $storeId, $order = ['id', 'DESC']);
 }
 }
\ No newline at end of file

src/GroupBooking/Enum/GroupBookingEnum.php

@@ -17,4 +17,7 @@ class GroupBookingEnum
 
 
 	const ONLINE = 1;//上线
 	const ONLINE = 1;//上线
 	const DOWNLINE = 2;//下线
 	const DOWNLINE = 2;//下线
+
+	const QUEUE_ORDER_KEY = 'groupBooking:order';
+	const QUEUE_LOCK_KEY = 'groupBooking:lock:';
 }
 }
\ No newline at end of file

src/Notice/Common/WxMiniNotice.php

@@ -20,9 +20,10 @@ class WxMiniNotice
      * @param array $param
      * @param array $param
      * @return string
      * @return string
      */
      */
-    public static function generatePage(string $page, array $param)
+    public static function generatePage(string $page, array $param = [])
     {
     {
         $param['origin'] = $param['origin']??'notice';
         $param['origin'] = $param['origin']??'notice';
+        $param['isShare'] = 1;
 
 
         $param = http_build_query($param);
         $param = http_build_query($param);
 
 

src/Transfer/Enum/WxTransferEnum.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: Administrator
+ * Date: 2018/11/3
+ * Time: 15:36
+ */
+namespace Hdll\Services\Transfer\Enum;
+
+class WxTransferEnum
+{
+    const FRONTEND = 1;
+
+    const BACKEND  = 2;
+}
\ No newline at end of file

src/Transfer/Lib/WithdrawInterface.php

@@ -13,10 +13,13 @@ use Swoft\Core\ResultInterface;
  * 提现服务
  * 提现服务
  *
  *
  * @method ResultInterface deferWithdraw($paySn, $openId, $realName, $amount, $type, $storeId, $withdrawId)
  * @method ResultInterface deferWithdraw($paySn, $openId, $realName, $amount, $type, $storeId, $withdrawId)
+ * @method ResultInterface deferStoreWithdraw($paySn, $openId, $realName, $amount, $type, $storeId, $withdrawId)
  * Interface WithdrawInterface
  * Interface WithdrawInterface
  * @package Hdll\Services\Transfor\Lib
  * @package Hdll\Services\Transfor\Lib
  */
  */
 interface WithdrawInterface
 interface WithdrawInterface
 {
 {
     public function withdraw($paySn, $openId, $realName, $amount, $type, $storeId, $withdrawId);
     public function withdraw($paySn, $openId, $realName, $amount, $type, $storeId, $withdrawId);
+
+    public function storeWithdraw($paySn, $openId, $realName, $amount, $type, $storeId, $withdrawId);
 }
 }
\ No newline at end of file