Merge remote-tracking branch 'origin/master'

src/Common/Pool/Config/GoodsPoolConfig.php

@@ -20,6 +20,12 @@ use Swoft\Pool\PoolProperties;
  */
  */
 class GoodsPoolConfig extends PoolProperties
 class GoodsPoolConfig extends PoolProperties
 {
 {
+	public function __construct()
+	{
+		// 区别本地和线上的RPC服务地址
+		$this->uri = explode(',', env('RPC_GOODS_URI', '172.21.0.47:8099,172.16.255.235:8099'));
+	}
+
 
 
 	protected $name = 'seller';
 	protected $name = 'seller';
 
 

src/Common/Pool/Config/SellerDistributionPoolConfig.php

@@ -21,6 +21,12 @@ use Swoft\Pool\PoolProperties;
 class SellerDistributionPoolConfig extends PoolProperties
 class SellerDistributionPoolConfig extends PoolProperties
 {
 {
 
 
+	public function __construct()
+	{
+		// 区别本地和线上的RPC服务地址
+		$this->uri = explode(',', env('RPC_SELLER_DISTRIBUTION_URI', '172.21.0.17:8099,172.16.255.34:8099'));
+	}
+
     protected $name = 'sellerDistribution';
     protected $name = 'sellerDistribution';
 
 
     /**
     /**

src/Common/Pool/Config/SellerPoolConfig.php

@@ -21,6 +21,12 @@ use Swoft\Pool\PoolProperties;
 class SellerPoolConfig extends PoolProperties
 class SellerPoolConfig extends PoolProperties
 {
 {
 
 
+	public function __construct()
+	{
+		// 区别本地和线上的RPC服务地址
+		$this->uri = explode(',', env('RPC_SELLER_URI', '172.21.0.10:8099,172.16.255.196:8099'));
+	}
+
     protected $name = 'seller';
     protected $name = 'seller';
 
 
     /**
     /**

src/Common/Pool/Config/WithdrawCashPoolConfig.php

@@ -21,6 +21,10 @@ use Swoft\Pool\PoolProperties;
 class WithdrawCashPoolConfig extends PoolProperties
 class WithdrawCashPoolConfig extends PoolProperties
 {
 {
 
 
+    public function __construct()
+    {
+        $this->uri=explode(',',env('RPC_WITHDRAWCASH_URI','172.21.0.33:8099,172.16.255.12:8099'));
+    }
     protected $name = 'withdrawCash';
     protected $name = 'withdrawCash';
 
 
     /**
     /**

src/Order/Enum/OrderItemEnum.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: Administrator
+ * Date: 2018/8/17
+ * Time: 16:23
+ */
+namespace Hdll\Services\Order\Enum;
+
+class OrderItemEnum
+{
+    const NORMAL    = 1; //正常
+
+    const CLOSED    = 2;//关闭
+
+    const DELIVERED = 3;//核销
+
+    const LOCKED    = 4;//锁定
+}
\ No newline at end of file

src/WithdrawCash/Lib/SellerCnDrawInterface.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 SellerCnDrawInterface service
+ *
+ * @method ResultInterface deferPaySuccess(int $storeId,int $id,string $wxOrderSn,int $fee)
+ * @method ResultInterface deferPayFailed(int $storeId,int $id,string $message)
+ */
+interface SellerCnDrawInterface{
+    /**
+     * 支付成功接口
+     *
+     * @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/SellerFundDrawInterface.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 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