Merge remote-tracking branch 'origin/master'

src/Common/Exception/ExceptionParseData.php

@@ -9,7 +9,7 @@ namespace Hdll\Services\Common\Exception;
 
 
 class ExceptionParseData
 class ExceptionParseData
 {
 {
-    public static function parseData(\Exception $e)
+    public static function parseData(\Throwable $e)
     {
     {
         if ( is_callable([$e,'getResponse']) ) {
         if ( is_callable([$e,'getResponse']) ) {
             $response = $e->getResponse();
             $response = $e->getResponse();
@@ -19,6 +19,7 @@ class ExceptionParseData
             $msg = isset($data['0'])?$data['0']:'';
             $msg = isset($data['0'])?$data['0']:'';
 
 
             $data =  json_decode($msg,true);
             $data =  json_decode($msg,true);
+            $data = empty($data)?$response:$data;
         } else {
         } else {
             $data['msg'] = $e->getMessage();
             $data['msg'] = $e->getMessage();
             $data['code'] = 500;
             $data['code'] = 500;

src/Common/Pool/Config/WithdrawCashPoolConfig.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;
+
+/**
+ * the config of service WithdrawCash
+ *
+ * @Bean()
+ */
+class WithdrawCashPoolConfig extends PoolProperties
+{
+
+    protected $name = 'withdrawCash';
+
+    /**
+     * 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>
+     *
+     * @var array
+     */
+    protected $uri = [
+        '192.168.3.12:8002',
+    ];
+
+    /**
+     * 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/WithdrawCash/Lib/BuyerCnDrawInterface.php

+<?php
+/**
+ * 买家佣金提现接口
+ *
+ * @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\WithdrawCash\Lib;
+use Swoft\Core\ResultInterface;
+
+/**
+ * The interface of BuyerCnDrawInterface service
+ *
+ * @method ResultInterface deferPaySuccess(int $storeId,int $id,string $wxOrderSn,int $fee)
+ * @method ResultInterface deferPayFailed(int $storeId,int $id,string $message)
+ */
+interface BuyerCnDrawInterface{
+    /**
+     * 支付成功接口
+     *
+     * @param integer $storeId      店铺ID
+     * @param integer $id           提现记录ID
+     * @param string  $wxOrderSn    微信支付订单号
+     * @param integer $fee          手续费
+     * @return void
+     */
+    public function paySuccess(int $storeId,int $id,string $wxOrderSn,int $fee);
+
+    /**
+     * 支付失败接口
+     *
+     * @param integer $storeId      店铺ID
+     * @param integer $id           提现记录ID
+     * @param string $message       失败信息
+     * @return void
+     */
+    public function payFailed(int $storeId,int $id,string $message);
+}
\ No newline at end of file