Merge branch 'xmy' of http://git.dev.2b3.cn/tencent/services into xmy

UPGRADE.md

+# 1.0.84
+- 添加通过店铺id列表获取店铺信息的接口
+
+# 1.0.83
+- 添加服务模版消息
+
 # 1.0.82
 # 1.0.82
 - 添加根据店铺名称获取店铺信息的rpc接口
 - 添加根据店铺名称获取店铺信息的rpc接口
 
 

src/Craftsman/Lib/CraftsmanInterface.php

@@ -19,6 +19,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 deferGetCraftsmenById(int $storeId, int $cmanId)
  * @method ResultInterface deferGetCraftsmenById(int $storeId, int $cmanId)
+ * @method ResultInterface deferGetCraftsmenByIds(int $storeId, array $cmanIds)
  */
  */
 interface CraftsmanInterface
 interface CraftsmanInterface
 {
 {
@@ -63,4 +64,14 @@ interface CraftsmanInterface
      */
      */
     public function getCraftsmenById(int $storeId, int $cmanId);
     public function getCraftsmenById(int $storeId, int $cmanId);
 
 
+    /**
+     * 根据店铺Id和店员Id列表获取店员列表
+     *
+     * @param integer $storeId
+     * @param array $cmanIds
+     * @Number(name="storeId")
+     * @return array
+     */
+    public function getCraftsmenByIds(int $storeId, array $cmanIds);
+
 }
 }
\ No newline at end of file

src/FlowCount/Lib/VisitorInterface.php

@@ -11,7 +11,8 @@ namespace Hdll\Services\FlowCount\Lib;
 use Swoft\Core\ResultInterface;
 use Swoft\Core\ResultInterface;
 
 
 /**
 /**
- * @method ResultInterface deferAdd(array $data)
+ * @method ResultInterface deferAdd(int $storeId, array $data)
+ * @method ResultInterface deferBrowseAndShare(int $storeId, int $type, array $itemIds)
  * Interface VisitorInterface
  * Interface VisitorInterface
  * @package App\Lib
  * @package App\Lib
  */
  */
@@ -20,8 +21,8 @@ interface VisitorInterface
 
 
     /**
     /**
      * 添加访客
      * 添加访客
+     * @param int $storeId
      * @param array $data
      * @param array $data
-     * int $data['storeId']=> 商家id
      * int $data['visitorId']=>访客id
      * int $data['visitorId']=>访客id
      * int $data['date']=>访问时间
      * int $data['date']=>访问时间
      * int $data['appType']=>访问的app类型   默认传值：1前台小程序，2后台小程序
      * int $data['appType']=>访问的app类型   默认传值：1前台小程序，2后台小程序
@@ -29,6 +30,29 @@ interface VisitorInterface
      * string $data['headImgUrl']=>'访客头像URL'
      * string $data['headImgUrl']=>'访客头像URL'
      * @return mixed
      * @return mixed
      */
      */
-	public function add(array $data);
+	public function add(int $storeId, array $data);
+
+    /**
+     * 访问量和转发量
+     * @param int $storeId      店铺id
+     * @param int $type         类型：0普通商品 1砍价 2限时购 3拼团
+     * @param array $itemIds    商品或活动（活动指：砍价、限时购 、拼团）的id列表
+     * 说明：$itemIds 格式[1,2,3]
+     * @return ;
+     * 响应参数：
+     * [
+     *  'browseNum' => [
+     *      'itemId' => '统计数'，
+     *      'itemId' => '统计数'，
+     *      ... ...
+     *   ],
+     *  'shareNum' => [
+     *      'itemId' => '统计数'，
+     *      'itemId' => '统计数'，
+     *      ... ...
+     *    ]
+     * ]
+     */
+    public function browseAndShare(int $storeId, int $type, array $itemIds);
 
 
 }
 }
\ No newline at end of file

src/GroupBooking/Enum/GroupBookingCmqEnum.php

 <?php
 <?php
+
 namespace Hdll\Services\GroupBooking\Enum;
 namespace Hdll\Services\GroupBooking\Enum;
 
 
-class GroupBookingCmqEnum{
+class GroupBookingCmqEnum
+{
 
 
 	const TOPIC = 'groupBooking';
 	const TOPIC = 'groupBooking';
 
 
-	const CLOSE_RECORD = 'closeRecord';
+	const CLOSE_RECORD = 'closeRecord';//关闭拼团
+
+	const GROUP_BOOKING = 'groupBooking';//拼团成功回调
 }
 }
\ No newline at end of file

src/SMS/Lib/SMSInterface.php

@@ -22,6 +22,7 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferPayOrder(int $storeId,string $orderSn,int $payStatus) 
  * @method ResultInterface deferPayOrder(int $storeId,string $orderSn,int $payStatus) 
  * @method ResultInterface deferGetOrder(int $storeId,int $smsOId)
  * @method ResultInterface deferGetOrder(int $storeId,int $smsOId)
  * @method ResultInterface deferGetOrderBySn(int $storeId,string $sn)
  * @method ResultInterface deferGetOrderBySn(int $storeId,string $sn)
+ * @method ResultInterface deferGetCountLeft(int $storeId)
  */
  */
 interface SMSInterface
 interface SMSInterface
 { 
 { 
@@ -64,4 +65,13 @@ interface SMSInterface
      */
      */
     public function getOrderBySn(int $storeId,string $sn);
     public function getOrderBySn(int $storeId,string $sn);
 
 
+
+     /**
+     * 根据店铺id 获取剩余的短信条数
+     *
+     * @param integer $storeId
+     * @return int
+     */
+    public function getCountLeft(int $storeId);
+    
 }
 }

src/Store/Lib/StoreInterface.php

@@ -21,6 +21,7 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferGetStoreByStoreName(string $storeName)
  * @method ResultInterface deferGetStoreByStoreName(string $storeName)
  * @method ResultInterface deferGetStoreBySellerId(int $sellerId)
  * @method ResultInterface deferGetStoreBySellerId(int $sellerId)
  * @method ResultInterface deferGetListBySellerIds(array $sellerIds, array $fields = [])
  * @method ResultInterface deferGetListBySellerIds(array $sellerIds, array $fields = [])
+ * @method ResultInterface deferGetListByStoreIds(array $storeIds, array $fields = [])
  * @method ResultInterface deferGetStoreByMobile(int $mobile, array $fields = [])
  * @method ResultInterface deferGetStoreByMobile(int $mobile, array $fields = [])
  * @method ResultInterface deferUpdateStore(int $storeId, array $data)
  * @method ResultInterface deferUpdateStore(int $storeId, array $data)
  * @method ResultInterface deferAddVipTime(int $storeId, int $days)
  * @method ResultInterface deferAddVipTime(int $storeId, int $days)
@@ -81,6 +82,15 @@ interface StoreInterface
     public function getListBySellerIds(array $sellerIds, array $fields = []);
     public function getListBySellerIds(array $sellerIds, array $fields = []);
 
 
     /**
     /**
+     * 根据店铺ID列表获取店铺信息列表
+     *
+     * @param array $storeIds
+     * @param array $fields
+     * @return array
+     */
+    public function getListByStoreIds(array $storeIds, array $fields = []);
+
+    /**
      * 根据注册手机号获取店铺信息
      * 根据注册手机号获取店铺信息
      *
      *
      * @param integer $mobile
      * @param integer $mobile