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

src/BuyerDistribution/Lib/BuyerDistributionInterface.php → src/Buyer/Lib/BillInterface.php

@@ -6,48 +6,20 @@
  * Time: 13:48
  */
 
-namespace Hdll\Services\BuyerDistribution\Lib;
+namespace Hdll\Services\Buyer\Lib;
 
 
+use Swoft\Core\ResultInterface;
+
 /**
- * @method ResultInterface deferAddSellerFreezeMoney(int $storeId,int $money)
- * @method ResultInterface deferGetBuyerCommission(int $buyerId)
- * @method ResultInterface deferGetSellerFund(int $storeId)
  * @method ResultInterface deferSaveBill(string $token,int $order_id,int $buyer_id,int $store_id,string $order_sn,int $money)
  * Interface AgencyInterface
  * @package App\Lib
  */
-interface BuyerDistributionInterface{
-
-
-	/**
-	 * 增加卖家冻结金额
-	 * @param int $storeId
-	 * @param int $money 冻结金额（千分）
-	 * @return mixed
-	 * @author Administrator
-	 */
-	public function addSellerFreezeMoney(int $storeId,int $money);
-
-	/**
-	 * 获取买家佣金数据
-	 * @param int $buyerId
-	 * @return mixed
-	 * @author Administrator
-	 */
-	public function getBuyerCommission(int $buyerId);
-
-	/**
-	 * 获取卖家资金数据
-	 * @param int $storeId
-	 * @return mixed
-	 * @author Administrator
-	 */
-	public function getSellerFund(int $storeId);
+interface BillInterface{
 
 	/**
 	 * 保存账单数据
-	 * @param string $token
 	 * @param int    $order_id
 	 * @param int    $buyer_id
 	 * @param int    $store_id
@@ -57,7 +29,6 @@ interface BuyerDistributionInterface{
 	 * @author Administrator
 	 */
 	public function saveBill(
-		string $token,
 		int $order_id,
 		int $buyer_id,
 		int $store_id,

src/BuyerDistribution/Enum/BuyerDistributionError.php

-<?php
-/**
- * Created by PhpStorm.
- * User: Administrator
- * Date: 2018/7/17
- * Time: 14:19
- */
-
-namespace Hdll\Services\Order\Enum;
-
-class BuyerDistributionError
-{
-
-	const E101 = ['101', '金额不能小于0'];
-	const E102 = [102, '该数据不属于您', 403];
-	const E103 = [103, '请勿重复创建', 403];
-	const E104 = [104, '该用户不存在或属于您的团队', 403];
-
-	public function getError($code)
-	{
-		$reflect = new \ReflectionClass(self::class);
-		$arr = $reflect->getConstant('E' . substr($code, -3));
-		if (!is_array($arr)) {
-			return false;
-		}
-		return [
-			'code' => $arr[0],
-			'msg' => $arr[1],
-			'errorCode' => $arr[2],
-		];
-	}
-}
\ No newline at end of file

src/Common/Exception/ExceptionData.php

@@ -40,14 +40,18 @@ class ExceptionData
         if ( is_callable([$e,"getPath"]) ) {//自建异常类处理path
             $data['path'] = json_decode($e->getPath(), true);
 
+            //获取调用堆栈信息
+            $info = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS,1)[0];
+            //将此次异常信息入站
+            array_unshift($data['path'],'Service:'.APP_NAME.' file:'.$info['file'].'('.$info['line'].')');
+
         } else { //系统异常统一报500错误
             $data['code'] = 500;
+
+            //将此次异常信息入站
+            array_unshift($data['path'],'Service:'.APP_NAME.' file:'.$e->getFile().'('.$e->getLine().')');
         }
 
-        //获取调用堆栈信息
-        $info = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS,1)[0];
-        //将此次异常信息入站
-        array_unshift($data['path'],'Service:'.APP_NAME.' file:'.$info['file'].'('.$info['line'].')');
 
 
         return ['msg' => json_encode($data), 'code' => $data['code']];

src/Seller/Lib/SellerFundInterface.php

@@ -12,31 +12,24 @@ use Swoft\Core\ResultInterface;
 
 /**
  *
- * @method ResultInterface deferWithdraw($sellerId, $money)
- * @method ResultInterface deferWithdrawFail($sellerId, $money)
+ * @method ResultInterface deferGetFund($sellerId)
  * Interface SellerInterface
  * @package App\Lib
  */
 interface SellerFundInterface
 {
 
-
-	/**
-	 * 提现
-	 * @param $sellerId
-	 * @param $money (分)
-	 * @return mixed
-	 * @author Administrator
-	 */
-	public function withdraw($sellerId, $money);
-
 	/**
-	 * 提现失败
+	 *
 	 * @param $sellerId
-	 * @param $money (分)
 	 * @return mixed
+	 * totalFund   累计资金
+	 * balanceFund 可提现金额
+	 * commissionFund  需要支付的佣金
+	 * expectFund  冻结金额
+	 * totalWithdraw   累计提现
 	 * @author Administrator
 	 */
-	public function withdrawFail($sellerId, $money);
+	public function getFund($sellerId);
 
 }
\ No newline at end of file

src/SellerDistribution/Lib/SellerDistributionInterface.php

@@ -10,6 +10,7 @@ use Swoft\Core\ResultInterface;
 
 /**
  * @method ResultInterface deferSaveBill($orderId, $sellerId, $money)
+ * @method ResultInterface deferGetCommission($sellerId)
  * Interface SellerDistributionInterface
  * @package App\Lib
  */
@@ -28,4 +29,14 @@ interface SellerDistributionInterface{
 	 */
 	public function saveBill($orderId, $sellerId, $money);
 
+
+	/**
+	 * 获取佣金信息
+	 * @param $sellerId
+	 * @return mixed
+	 * totalCommission  累计佣金
+	 * balanceCommission    可提现佣金
+	 * @author Administrator
+	 */
+	public function getCommission($sellerId);
 }
\ No newline at end of file