Skip to content

S
services
Commit 3892cf64 by xmy
Options

Merge remote-tracking branch 'origin/master'

parents c7e88b9a 499f2004
Showing with 23 additions and 95 deletions
src/Buyer/Lib/CommissionInterface.php
...@@ -14,14 +14,23 @@ namespace Hdll\Services\Buyer\Lib; ...@@ -14,14 +14,23 @@ namespace Hdll\Services\Buyer\Lib;
interface CommissionInterface interface CommissionInterface
{ {
/** /**
* 扣除可提现金额（仅限于对账服务使用，切记！！！） * 扣除可提现金额
* *
* @param $storeId * @param $storeId
* @param $buyerId * @param $buyerId
* @param $money * @param $money
* @return bool * @return bool
*/ */
public function reduceBalanceCommissionCompare($storeId, $buyerId, $money); public function reduceBalanceCommission($storeId, $buyerId, $money);
/**
* 增加可提现金额
*
* @param $storeId
* @param $buyerId
* @param $money
* @return bool
*/
public function addBalanceCommission($storeId, $buyerId, $money);
/** /**
* 增加可提现金额（仅限于对账服务使用，切记！！！） * 增加可提现金额（仅限于对账服务使用，切记！！！）
......
src/Common/Lib/Alisms.php
...@@ -39,10 +39,8 @@ class Alisms ...@@ -39,10 +39,8 @@ class Alisms
// 短信模板预设参数 // 短信模板预设参数
$this->templateParam = $templateParam; $this->templateParam = $templateParam;
$configurator = \Swoft\App::getBean('config'); $commonConfigs = include dirname(__FILE__, 2).'/Config/config.php';
$configurator->load('@vendor/hdll/services/src/Common/Config'); $this->config = $commonConfigs['alisms'];
$this->config = $configurator->get('alisms');
} }
/** /**
......
src/WithdrawCash/Lib/BuyerCnDrawInterface.php deleted 100644 → 0
<?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
src/WithdrawCash/Lib/SellerFundDrawInterface.php deleted 100644 → 0
<?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 SellerFundDrawInterface service
*
* @method ResultInterface deferPaySuccess(int $storeId,int $id,string $wxOrderSn,int $fee)
* @method ResultInterface deferPayFailed(int $storeId,int $id,string $message)
*/
interface SellerFundDrawInterface{
/**
* 支付成功接口
*
* @param integer $storeId 店铺ID
* @param integer $id 提现记录ID
* @param string $wxOrderSn 微信支付订单号
* @param integer $fee 手续费
* @return boolean
*/
public function paySuccess(int $storeId,int $id,string $wxOrderSn,int $fee);
/**
* 支付失败接口
*
* @param integer $storeId 店铺ID
* @param integer $id 提现记录ID
* @param string $message 失败信息
* @return boolean
*/
public function payFailed(int $storeId,int $id,string $message);
}
\ No newline at end of file
src/WithdrawCash/Lib/SellerCnDrawInterface.php → src/WithdrawCash/Lib/WithdrawCashInterface.php
<?php <?php
/** /**
* 卖家佣金提现接口 * 买家佣金提现接口
* *
* @link https://swoft.org * @link https://swoft.org
* @document https://doc.swoft.org * @document https://doc.swoft.org
...@@ -11,30 +11,32 @@ namespace Hdll\Services\WithdrawCash\Lib; ...@@ -11,30 +11,32 @@ namespace Hdll\Services\WithdrawCash\Lib;
use Swoft\Core\ResultInterface; use Swoft\Core\ResultInterface;
/** /**
* The interface of SellerCnDrawInterface service * The interface of WithdrawCashInterface service
* *
* @method ResultInterface deferPaySuccess(int $storeId,int $id,string $wxOrderSn,int $fee) * @method ResultInterface deferPaySuccess(int $type,int $storeId,int $id,string $wxOrderSn,int $fee)
* @method ResultInterface deferPayFailed(int $storeId,int $id,string $message) * @method ResultInterface deferPayFailed(int $type,int $storeId,int $id,string $message)
*/ */
interface SellerCnDrawInterface{ interface WithdrawCashInterface{
/** /**
* 支付成功接口 * 支付成功接口
* *
* @param integer $type 提现类型
* @param integer $storeId 店铺ID * @param integer $storeId 店铺ID
* @param integer $id 提现记录ID * @param integer $id 提现记录ID
* @param string $wxOrderSn 微信支付订单号 * @param string $wxOrderSn 微信支付订单号
* @param integer $fee 手续费 * @param integer $fee 手续费
* @return boolean * @return boolean
*/ */
public function paySuccess(int $storeId,int $id,string $wxOrderSn,int $fee); public function paySuccess(int $type,int $storeId,int $id,string $wxOrderSn,int $fee);
/** /**
* 支付失败接口 * 支付失败接口
* *
* @param integer $type 提现类型
* @param integer $storeId 店铺ID * @param integer $storeId 店铺ID
* @param integer $id 提现记录ID * @param integer $id 提现记录ID
* @param string $message 失败信息 * @param string $message 失败信息
* @return boolean * @return boolean
*/ */
public function payFailed(int $storeId,int $id,string $message); public function payFailed(int $type,int $storeId,int $id,string $message);
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment