Merge remote-tracking branch 'origin/master'

UPGRADE.md

+# 1.0.9
+ - 添加访客统计的RPC接口
+ 
 # 1.0.8
 # 1.0.8
  -  分表逻辑判断处理
  -  分表逻辑判断处理
 # 1.0.7
 # 1.0.7

src/AccountBook/Lib/AccountInterface.php

@@ -22,7 +22,7 @@ use Swoft\Core\ResultInterface;
 interface AccountInterface
 interface AccountInterface
 {
 {
     /**
     /**
-     * 流水增加
+     * 流水增加收入
      * @param $storeId
      * @param $storeId
      * @param $money
      * @param $money
      * @param $ordirId
      * @param $ordirId
@@ -30,8 +30,18 @@ interface AccountInterface
      */
      */
     public function Income($storeId, $money, $ordirId);
     public function Income($storeId, $money, $ordirId);
 
 
+
+    /**
+     * 流水收入退款
+     * @param $storeId
+     * @param $money
+     * @param $orderId
+     * @return mixed
+     */
+    public function IncomeRefund($storeId, $money, $orderId);
+
     /**
     /**
-     * 流水减少
+     * 流水支出
      * @param $storeId
      * @param $storeId
      * @param $money
      * @param $money
      * @param $ordirId
      * @param $ordirId

src/CustomerProfiles/Lib/ProfileInterface.php

@@ -32,4 +32,6 @@ interface ProfileInterface
      */
      */
 
 
     public function AddOrder($storeId, $orderId, $goodsId, $goodsName, $orderPrice, $orderType, $orderTime, $consigneeName, $consigneePhone, $buyerId,$activityName);
     public function AddOrder($storeId, $orderId, $goodsId, $goodsName, $orderPrice, $orderType, $orderTime, $consigneeName, $consigneePhone, $buyerId,$activityName);
+
+
 }
 }
\ No newline at end of file

src/GroupBooking/Enum/GroupBookingEnum.php

@@ -20,4 +20,6 @@ class GroupBookingEnum
 
 
 	const QUEUE_ORDER_KEY = 'groupBooking:order';
 	const QUEUE_ORDER_KEY = 'groupBooking:order';
 	const QUEUE_LOCK_KEY = 'groupBooking:lock:';
 	const QUEUE_LOCK_KEY = 'groupBooking:lock:';
+
+	const QUEUE_LISTEN = 'groupBookingListener';
 }
 }
\ No newline at end of file

src/Seller/Lib/SellerFundInterface.php

@@ -20,6 +20,7 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferAddExpectFund($seller, $money)
  * @method ResultInterface deferAddExpectFund($seller, $money)
  * @method ResultInterface deferReduceExpectFund($seller, $money)
  * @method ResultInterface deferReduceExpectFund($seller, $money)
  * @method ResultInterface deferAddFund($seller, $money)
  * @method ResultInterface deferAddFund($seller, $money)
+ * @method ResultInterface deferAddActualCommissionFund($sellerId, $money)
  * Interface SellerInterface
  * Interface SellerInterface
  * @package App\Lib
  * @package App\Lib
  */
  */
@@ -103,4 +104,14 @@ interface SellerFundInterface
 	 * @author Administrator
 	 * @author Administrator
 	 */
 	 */
 	public function addFund($sellerId, $balanceFund, $commissionFund);
 	public function addFund($sellerId, $balanceFund, $commissionFund);
+
+
+	/**
+	 * 增加实付佣金
+	 * @param $sellerId
+	 * @param $money
+	 * @return mixed
+	 * @author Administrator
+	 */
+	public function addActualCommissionFund($sellerId, $money);
 }
 }
\ No newline at end of file

src/Store/Lib/VisitorCountInterface.php

@@ -26,7 +26,9 @@ interface VisitorCountInterface
      * @param int $storeId
      * @param int $storeId
      * @param int $visitorId
      * @param int $visitorId
      * @param array $data  此参数可选，不传表示只更新访问时间
      * @param array $data  此参数可选，不传表示只更新访问时间
-     * @return int 更新成功的条数
+     * nickname     昵称
+     * headImgUrl   头像
+     * @return bool
      */
      */
     public function updateVisitorData(int $storeId, int $visitorId, array $data = []);
     public function updateVisitorData(int $storeId, int $visitorId, array $data = []);
     
     

src/Vip/Enum/VipEnum.php

@@ -18,4 +18,6 @@ class VipEnum{
 	const STATUS_UNPAID = 10;//未支付
 	const STATUS_UNPAID = 10;//未支付
 
 
 	const STATUS_PAID = 20;//已支付
 	const STATUS_PAID = 20;//已支付
+
+	const VIP_QUEUE_KEY = 'vip:queue';
 }
 }
\ No newline at end of file