Merge branch 'ft-v4-customerprofile'

UPGRADE_2.x.md

@@ -26,8 +26,8 @@
 - 配合前端改版后端大调整
 - 配合前端改版后端大调整
 
 
 # 2.0.11
 # 2.0.11
+- 砍价订单枚举状态加订单删除
 - 关闭拼团活动状态
 - 关闭拼团活动状态
- 砍价订单枚举状态加订单删除
 
 
 # 2.0.10
 # 2.0.10
 - 根据商户平台id获取对应的小程序托管配置
 - 根据商户平台id获取对应的小程序托管配置

src/Craftsman/Enum/CmanEnum.php

+<?php
+namespace Hdll\Services\Craftsman\Enum;
+
+class CmanEnum 
+{
+    const SYNC_ITEM_ADD = 1;//新加商品
+    const SYNC_ITEM_DEL = 2;//去除商品
+
+    
+}
\ No newline at end of file

src/Craftsman/Lib/CraftsmanInterface.php

@@ -18,6 +18,7 @@ use Swoft\Core\ResultInterface;
  *
  *
  * @method ResultInterface deferGetCraftsmenList(int $storeId, int $subStoreId = 0, int $itemId = 0)
  * @method ResultInterface deferGetCraftsmenList(int $storeId, int $subStoreId = 0, int $itemId = 0)
  * @method ResultInterface deferGetCraftsmenByUnionId(string $unionId)
  * @method ResultInterface deferGetCraftsmenByUnionId(string $unionId)
+ * @method ResultInterface defercreateCraftsman($storeId, array $params)
  * @method ResultInterface deferGetCraftsmenById(int $storeId, int $cmanId)
  * @method ResultInterface deferGetCraftsmenById(int $storeId, int $cmanId)
  * @method ResultInterface deferGetCraftsmenByIds(int $storeId, array $cmanIds)
  * @method ResultInterface deferGetCraftsmenByIds(int $storeId, array $cmanIds)
  * @method ResultInterface deferSyncItems(int $storeId, array $itemIds, int $mode)
  * @method ResultInterface deferSyncItems(int $storeId, array $itemIds, int $mode)
@@ -37,6 +38,26 @@ interface CraftsmanInterface
     // wechat     店员微信号
     // wechat     店员微信号
 
 
     /**
     /**
+     * 创建店员
+     *
+     * @param integer $storeId
+     * @param array $params 所需参数
+     *array(
+     * 'name'    => '', // 姓名
+     * 'sex'     => '', // 性别
+     * 'wxNick'  => '', // 昵称
+     * 'headimg' => '', // 头像
+     * 'items'   => '', // 包含的服务项目列表
+     * 'subStores' => '', // 所属门店列表
+     * 'motto'   => '', // 个性签名
+     * 'adept'   => '', // 个人擅长
+     * 'wechat'  => '', // 微信号
+     *)
+     * @return int|bool
+     */
+    public function createCraftsman($storeId, array $params);
+
+    /**
      * 获取店员列表
      * 获取店员列表
      *
      *
      * @param integer $storeId
      * @param integer $storeId

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
  * The interface of demo service
  *
  *
  * @method  ResultInterface deferAddOrder($storeId, $orderId, $goodsId, $goodsName, $orderPrice, $orderType, $orderTime, $consigneeName, $consigneePhone, $buyerId,$activityName)
  * @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
 interface ProfileInterface
 {
 {
@@ -30,8 +31,15 @@ interface ProfileInterface
      * @param $orderType
      * @param $orderType
      * @return mixed
      * @return mixed
      */
      */
-
     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);
 
 
+    /**
+     * 自增加顾客档案访问数和最近访问时间戳
+     * @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/BrowseShare.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: Administrator
+ * Date: 2018/7/26
+ * Time: 16:00
+ */
+
+namespace Hdll\Services\FlowCount\Enum;
+
+/**
+ * 访问量和转发量 枚举
+ * Class BrowseShare
+ * @package Hdll\Services\FlowCount\Enum
+ */
+class BrowseShare
+{
+    const GOODS = 0;  // 普通商品
+	const BARGAIN = 1;  // 砍价
+	const LIMIT = 2;    // 限时购
+    const GROUP = 3;    // 拼团
+    const RECHARGE = 4; // 储值卡
+    const TIMES_CARD = 5; // 次卡
+    const FRONT_MONEY = 6; // 定金
+    const AWARD = 7; // 抽奖
+
+}
\ No newline at end of file

src/FlowCount/Enum/FlowCategory.php

@@ -8,9 +8,16 @@
 
 
 namespace Hdll\Services\FlowCount\Enum;
 namespace Hdll\Services\FlowCount\Enum;
 
 
+/**
+ * 是否新访客 枚举
+ * Class FlowCategory
+ * @package Hdll\Services\FlowCount\Enum
+ */
 class FlowCategory
 class FlowCategory
 {
 {
 	const BARGAIN = 1;  // 砍价
 	const BARGAIN = 1;  // 砍价
-	const LIMIT = 2; // 限时购
+	const LIMIT = 2;    // 限时购
     const GROUP = 3;    // 团购
     const GROUP = 3;    // 团购
+    const FRONTMONEY = 4; // 定金
+    const AWARD = 5; // 抽奖
 }
 }
\ No newline at end of file

src/FlowCount/Lib/VisitorInterface.php

@@ -36,7 +36,7 @@ interface VisitorInterface
     /**
     /**
      * 访问量和转发量
      * 访问量和转发量
      * @param int $storeId      店铺id
      * @param int $storeId      店铺id
-     * @param int $type         类型：0普通商品 1砍价 2限时购 3拼团
+     * @param int $type         类型（接口使用枚举：BrowseShare）：0普通商品 1砍价 2限时购 3拼团 4储值卡 5次卡 6定金 7抽奖
      * @param array $itemIds    商品或活动（活动指：砍价、限时购 、拼团）的id列表
      * @param array $itemIds    商品或活动（活动指：砍价、限时购 、拼团）的id列表
      * 说明：$itemIds 格式[1,2,3]
      * 说明：$itemIds 格式[1,2,3]
      * @return ;
      * @return ;
@@ -59,7 +59,7 @@ interface VisitorInterface
     /**
     /**
      * 统计是否有新访客
      * 统计是否有新访客
      * @param int $storeId  店铺id
      * @param int $storeId  店铺id
-     * @param int $type  类型：FlowCategory::BARGAIN 砍价 FlowCategory::LIMIT 限时购 FlowCategory::GROUP 拼团
+     * @param int $type  类型（接口使用枚举：FlowCategory）：1砍价 2限时购 3拼团 4定金 5抽奖
      * @param array $itemIds 活动ids列表，格式：[1,2,3]，默认：null
      * @param array $itemIds 活动ids列表，格式：[1,2,3]，默认：null
      * @return mixed
      * @return mixed
      * 响应参数：
      * 响应参数：

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 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 deferReturnCardMoney(int $storeId,int $buyerId,int $itemOrderId,string $itemTitle,int $payMoney, int $parentOrderId)
  * @method  ResultInterface deferStatisNum(int $storeId)
  * @method  ResultInterface deferStatisNum(int $storeId)
+ * @method  ResultInterface deferGetRecharge(int $storeId, int $buyerId)
  */
  */
 interface RechargeInterface
 interface RechargeInterface
 {
 {
@@ -79,6 +80,14 @@ interface RechargeInterface
      * ]
      * ]
      */
      */
     public function statisNum(int $storeId);
     public function statisNum(int $storeId);
+
+    /**
+     * 获取储值卡信息
+     * @param int $storeId
+     * @param int $buyerId
+     * @return mixed
+     */
+    public function getRecharge(int $storeId, int $buyerId);
 }
 }
 
 
 
 

src/Reservation/Lib/ReservationInterface.php

@@ -24,6 +24,7 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface defermarkReservFinished(int $storeId, int $orderId)
  * @method ResultInterface defermarkReservFinished(int $storeId, int $orderId)
  * @method ResultInterface deferAddReservation(int $storeId, int $orderId, int $buyerId, int $cmanId, int $reservTime, string $memo, int $type)
  * @method ResultInterface deferAddReservation(int $storeId, int $orderId, int $buyerId, int $cmanId, int $reservTime, string $memo, int $type)
  * @method ResultInterface deferCancelReservByOrderId(int $storeId, int $orderId, string $memo)
  * @method ResultInterface deferCancelReservByOrderId(int $storeId, int $orderId, string $memo)
+ * @method ResultInterface deferGetReservListByCmanId(int $storeId, int $cmanId, $state = null, $isConfirm = null)
  */
  */
 interface ReservationInterface
 interface ReservationInterface
 {
 {
@@ -117,4 +118,15 @@ interface ReservationInterface
      */
      */
     public function cancelReservByOrderId(int $storeId, int $orderId, string $memo = '');
     public function cancelReservByOrderId(int $storeId, int $orderId, string $memo = '');
 
 
+    /**
+     * 根据店员id，获取对应的预约列表
+     *
+     * @param integer $storeId
+     * @param integer $cmanId
+     * @param integer $state 0:预约未标记完成，1:预约已确定完成
+     * @Number(name="state")
+     * @return array
+     */
+    public function getReservListByCmanId(int $storeId, int $cmanId, $state = null, $isConfirm = null);
+
 }
 }
\ No newline at end of file

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