Merge branch 'ft-v4-customerprofile' into test

UPGRADE_2.x.md

+# 2.0.14
+- Cls记日志忽略‘验证器不存在’的日志
+
 # 2.0.13
 - ClsLog延迟时判断协程模式
 

src/CustomerProfiles/Enum/CustomerCmq.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: mac
+ * Date: 2019-01-10
+ * Time: 09:58
+ */
+
+namespace Hdll\Services\CustomerProfiles\Enum;
+
+class CustomerCmq{
+
+    const TOPIC = 'customer';
+
+    const ORDER_ADD = 'addOrder'; // 顾客下单记录
+    const ORDER_STATUS = 'payStatus'; // 顾客订单状态修改回调
+    const ORDER_PRICE = 'upPrice'; // 顾客订单价格修改
+    const PROFILE_ADD = 'addProfile'; // 顾客信息添加或修改
+}
\ No newline at end of file

src/CustomerProfiles/Lib/ProfileInterface.php

@@ -17,6 +17,7 @@ use Swoft\Core\ResultInterface;
  * The interface of demo service
  *
  * @method  ResultInterface deferAddOrder($storeId, $orderId, $goodsId, $goodsName, $orderPrice, $orderType, $orderTime, $consigneeName, $consigneePhone, $buyerId,$activityName)
+ * @method  ResultInterface deferSinceAddVisitor(int $storeId, int $buyerId, int $time)
  */
 interface ProfileInterface
 {
@@ -30,8 +31,15 @@ interface ProfileInterface
      * @param $orderType
      * @return mixed
      */
-
     public function AddOrder($storeId, $orderId, $goodsId, $goodsName, $orderPrice, $orderType, $orderTime, $consigneeName, $consigneePhone, $buyerId,$activityName);
 
+    /**
+     * 自增加顾客档案访问数和最近访问时间戳
+     * @param int $storeId // 店铺id
+     * @param int $buyerId // 买家id
+     * @param int $time // 访问时间
+     * @return mixed
+     */
+    public function sinceAddVisitor(int $storeId, int $buyerId, int $time);
 
 }
\ No newline at end of file

src/FlowCount/Enum/FlowCategory.php

@@ -11,6 +11,7 @@ namespace Hdll\Services\FlowCount\Enum;
 class FlowCategory
 {
 	const BARGAIN = 1;  // 砍价
-	const LIMIT = 2; // 限时购
+	const LIMIT = 2;    // 限时购
     const GROUP = 3;    // 团购
+    const FRONTMONEY = 4; // 定金
 }
\ No newline at end of file

src/Recharge/Lib/RechargeInterface.php

@@ -19,6 +19,7 @@ use Swoft\Core\ResultInterface;
  * @method  ResultInterface deferSpendCardMoney(int $storeId, int $buyerId, array $subOrders, int $parentOrderId)
  * @method  ResultInterface deferReturnCardMoney(int $storeId,int $buyerId,int $itemOrderId,string $itemTitle,int $payMoney, int $parentOrderId)
  * @method  ResultInterface deferStatisNum(int $storeId)
+ * @method  ResultInterface deferGetRecharge(int $storeId, int $buyerId)
  */
 interface RechargeInterface
 {
@@ -79,6 +80,14 @@ interface RechargeInterface
      * ]
      */
     public function statisNum(int $storeId);
+
+    /**
+     * 获取储值卡信息
+     * @param int $storeId
+     * @param int $buyerId
+     * @return mixed
+     */
+    public function getRecharge(int $storeId, int $buyerId);
 }
 
 

src/TimesCard/Lib/TimesCardInterface.php

@@ -18,14 +18,14 @@ use Swoft\Core\ResultInterface;
  *
  * @method  ResultInterface deferPayStatus(int $storeId,int $bargainbranchId,int $status,int $orderId)
  * @method  ResultInterface deferSpendTimesCard(int $storeId, int $buyerId, int $usercardId, array $subOrders)
- * @method  ResultInterface deferReturnCardTimes( int $storeId,int $buyerId,int $itemOrderId,int $goodsId,string $itemTitle,int    $times)
+ * @method  ResultInterface deferReturnCardTimes(int $storeId,int $buyerId,int $itemOrderId,int $goodsId,string $itemTitle,int    $times)
  * @method  ResultInterface defergetTimesCardUserCardInfo(int $storeId, int $goodsId)
- * @method  ResultInterface deferStatisNum( int $storeId)
+ * @method  ResultInterface deferStatisNum(int $storeId)
+ * @method  ResultInterface deferValidNum(int $storeId, int $buyerId)
  */
 interface TimesCardInterface
 {
 
-
     /**
      * 微信支付 状态 回馈接口
      * @param string $storeId //
@@ -33,11 +33,7 @@ interface TimesCardInterface
      * @param int $status // BuyCardPayStatus::HAVE_PAY 成功支付  BuyCardPayStatus::PAY_EXCEPTION：未支付 （已经过期或者支付异常）
      * @return mixed
      */
-    public function payStatus(
-        int $storeId,
-        int $itemId,
-        int $status ,  //
-        int $orderId);
+    public function payStatus(int $storeId, int $itemId, int $status, int $orderId);
 
     /**
      * 花费卡次数
@@ -59,15 +55,7 @@ interface TimesCardInterface
      * @param int $payMoney
      * @return mixed
      */
-    public function ReturnCardTimes(
-        int $storeId,
-        int $buyerId,
-        int $itemOrderId,
-        int $goodsId,
-        string $itemTitle,
-        int $times
-    );
-
+    public function ReturnCardTimes(int $storeId, int $buyerId, int $itemOrderId, int $goodsId, string $itemTitle, int $times);
 
     /**
      * 通过商品id  获取是否 有正在服务的次卡用户
@@ -85,10 +73,19 @@ interface TimesCardInterface
      * 响应数据：
      * [
      *  'num' => 上架数,
+     *  'outNum' => 下架数
      *  'total' => 总数
      * ]
      */
     public function statisNum(int $storeId);
+
+    /**
+     * 获取有效次卡数
+     * @param int $storeId
+     * @param int $buyerId
+     * @return mixed
+     */
+    public function validNum(int $storeId, int $buyerId);
 }