Merge remote-tracking branch 'origin/master'

src/Bargain/Enum/BargainEnum.php

@@ -13,7 +13,9 @@ class BargainEnum
   
   
     //订单状态
     //订单状态
     const STATUS_NORMAL = 10; //待支付
     const STATUS_NORMAL = 10; //待支付
-
+    const STATUS_IN_MINI_PRICE = 20; //已经到底价
+    const STATUS_HAVE_ORDER = 30; //已经下单
+    const STATUS_HAVE_BUY = 40; //已经购买
 
 
 
 
     //paystatus
     //paystatus

src/SellerDistribution/Lib/SellerDistributionInterface.php

@@ -13,8 +13,6 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferGetCommission($sellerId)
  * @method ResultInterface deferGetCommission($sellerId)
  * method ResultInterface deferAddBalance($sellerId, $money)
  * method ResultInterface deferAddBalance($sellerId, $money)
  * method ResultInterface deferReduceBalance($sellerId, $money)
  * method ResultInterface deferReduceBalance($sellerId, $money)
- * method ResultInterface deferAddTotal($sellerId, $money)
- * method ResultInterface deferReduceTotal($sellerId, $money)
  * method ResultInterface deferListByOrderId($storeId, $orderId,$sellerId)
  * method ResultInterface deferListByOrderId($storeId, $orderId,$sellerId)
  * Interface SellerDistributionInterface
  * Interface SellerDistributionInterface
  * @package App\Lib
  * @package App\Lib
@@ -63,23 +61,6 @@ interface SellerDistributionInterface{
 	 */
 	 */
 	public function reduceBalance($sellerId, $money);
 	public function reduceBalance($sellerId, $money);
 
 
-	/**
-	 * 增加累计佣金
-	 * @param $sellerId
-	 * @param $money
-	 * @return mixed
-	 * @author Administrator
-	 */
-	public function addTotal($sellerId, $money);
-
-	/**
-	 * 减少累计佣金
-	 * @param $sellerId
-	 * @param $money
-	 * @return mixed
-	 * @author Administrator
-	 */
-	public function reduceTotal($sellerId, $money);
 
 
 	/**
 	/**
 	 * 获取分销记录
 	 * 获取分销记录