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

src/Buyer/Lib/BuyerInterface.php

@@ -14,6 +14,7 @@ use Swoft\Core\ResultInterface;
  * @method  ResultInterface deferUpdateProfile(string $token, array $data)
  * @method  ResultInterface deferSelectUser(int $storeId, array $buyerIds, array $fields= ['*'])
  * @method  ResultInterface deferGetRefereeInfo($storeId,$buyerId)
+ * @method  ResultInterface deferGetByNickname($nickname)
  * Interface BuyerInterface
  * @package App\Lib
  */
@@ -90,4 +91,13 @@ interface BuyerInterface
      * @return mixed
      */
     public function getRefereeInfo($storeId,$buyerId);
+
+
+	/**
+	 * 获取（视图）买家信息 by nickname
+	 * @param $nickname
+	 * @return mixed
+	 * @author work
+	 */
+	public function getByNickname($nickname);
 }
\ No newline at end of file

src/Coupon/Lib/CouponInterface.php

@@ -16,7 +16,7 @@ use Swoft\Core\ResultInterface;
 /**
  * The interface of coupon service
  *
- * @method ResultInterface deferCheckCoupon(int $buyerId, int $storeId, int $couponId, int $itemId)
+ * @method ResultInterface deferCheckCoupon(int $buyerId, int $storeId, int $couponId, array $itemIds)
  * @method ResultInterface deferGetCouponRecvdList(int $buyerId, int $storeId, int $subStoreId = 0, int $itemId = 0)
  * @method ResultInterface deferGetDataByCouponId(int $buyerId, int $storeId, int $couponId)
  */
@@ -40,10 +40,10 @@ interface CouponInterface
      * @param integer $buyerId
      * @param integer $storeId
      * @param integer $couponId
-     * @param integer $itemId
+     * @param array $itemIds
      * @return int|boolen 如果可用返回优惠券的面值，不可用返回false
      */
-    public function checkCoupon(int $buyerId, int $storeId, int $couponId, int $itemId);
+    public function checkCoupon(int $buyerId, int $storeId, int $couponId, array $itemIds);
 
     /**
      * 更新优惠券状态

src/FlowCount/Lib/VisitorInterface.php

@@ -11,7 +11,8 @@ namespace Hdll\Services\FlowCount\Lib;
 use Swoft\Core\ResultInterface;
 
 /**
- * @method ResultInterface deferAdd($storeId, array $data)
+ * @method ResultInterface deferAdd(int $storeId, array $data)
+ * @method ResultInterface deferBrowseAndShare(int $storeId, int $type, array $itemIds)
  * Interface VisitorInterface
  * @package App\Lib
  */
@@ -19,7 +20,6 @@ interface VisitorInterface
 {
 
     /**
-     *
      * 添加访客
      * @param int $storeId
      * @param array $data
@@ -30,6 +30,29 @@ interface VisitorInterface
      * string $data['headImgUrl']=>'访客头像URL'
      * @return mixed
      */
-	public function add($storeId, 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/Goods/Lib/GoodsInterface.php

@@ -17,6 +17,10 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferGetServiceByGoodsId($storeId, $goodsId, $type = 3)
  * @method ResultInterface deferGetReturnVisitByGoodsId($storeId, $goodsId, $type = 2)
  * @method ResultInterface deferListByIds($ids, $storeId)
+ * @method ResultInterface deferGetSkuInfo($skuId, $goodsId, $storeId)
+ * @method ResultInterface deferGetSkuByIds($goodsId, $skuIds, $storeId)
+ * @method ResultInterface deferGetSkuByGoodsId($goodsId, $storeId)
+ * @method ResultInterface deferGetSpecAttributeByGoodsId($goodsId, $storeId)
  * @method ResultInterface deferAfterServiceTmp($storeId)
  * Interface GoodsInterface
  * @package Hdll\Services\Goods\Lib
@@ -99,6 +103,39 @@ interface GoodsInterface
     public function listByIds(array $ids, $storeId, $order = ['id', 'DESC']);
 
     /**
+     * 获取sku信息
+     * @param $skuId
+     * @param $goodsId
+     * @param $storeId
+     * @return mixed
+     * @author work
+     */
+    public function getSkuInfo($skuId, $goodsId, $storeId);
+
+    /**
+     * 获取多个sku信息
+     * @param $goodsId
+     * @param $skuIds
+     * @return mixed
+     * @author work
+     */
+    public function getSkuByIds($goodsId, $skuIds, $storeId);
+
+
+    public function getSkuByGoodsId($goodsId, $storeId);
+
+
+    /**
+     * 获取商品规格属性
+     * @param $goodsId
+     * @param $storeId
+     * @return mixed
+     * @author work
+     */
+    public function getSpecAttributeByGoodsId($goodsId, $storeId);
+
+
+    /**
      * 添加后续服务模版
      * @param $storeId
      * @return mixed

src/GroupBooking/Enum/GroupBookingCmqEnum.php

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

src/Order/Enum/OrderItemEnum.php

@@ -17,9 +17,7 @@ class OrderItemEnum
 
     const LOCKED    = 4;//锁定
 
-    //核销渠道
-    const DELIVERED_BUYER_BTN = 1; //买家按钮核销
-    const DELIVERED_EMPLOYEE_CODE = 2; //店员扫码核销
-    const DELIVERED_SELLER_CODE = 3; //店主扫码码核销
-    const DELIVERED_SELLER_BTN = 4; //店主按钮核销
+    //核销方式
+    const DELIVERED_BTN = 1; //按钮核销
+    const DELIVERED_CODE = 2; //扫码核销
 }
\ No newline at end of file

src/Recharge/Lib/RechargeInterface.php

@@ -16,8 +16,8 @@ use Swoft\Core\ResultInterface;
 /**
  * The interface of demo service
  *
- * @method  ResultInterface deferpayStatus(int $storeId,int $bargainbranchId,int $status,int $orderId)
- * @method  ResultInterface deferspendCardMoney( int $storeId,int $buyerId,int $itemOrderId,string $itemTitle,int $payMoney)
+ * @method  ResultInterface deferPayStatus(int $storeId,int $bargainbranchId,int $status,int $orderId)
+ * @method  ResultInterface deferSpendCardMoney(int $storeId, int $buyerId, array $subOrders)
  * @method  ResultInterface deferReturnCardMoney( int $storeId,int $buyerId,int $itemOrderId,string $itemTitle,int $payMoney)
  */
 interface RechargeInterface
@@ -41,16 +41,23 @@ interface RechargeInterface
      * 花费卡金额
      * @param int $storeId
      * @param int $buyerId
-     * @param int $goodOrderId
+     * @param array $subOrders
+     * $subOrders 示例：
+     * [
+     *     [
+     *         'id' => 333, 
+     *         'itemName' => 'namenamename', 
+     *         'actualAmount' => 444,
+     *     ],
+     *     [
+     *         'id' => 555, 
+     *         'itemName' => 'namenamename', 
+     *         'actualAmount' => 666,
+     *     ],
+     * ]
      * @return mixed
      */
-    public function spendCardMoney(
-        int $storeId,
-        int $buyerId,
-        int $itemOrderId,
-        string $itemTitle,
-        int $payMoney
-    );
+    public function spendCardMoney(int $storeId, int $buyerId, array $subOrders);
 
     /**
      * 退回储值卡金额

src/SMS/Lib/SMSInterface.php

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

src/SellerDistribution/Lib/SellerDistributionInterface.php

@@ -5,22 +5,26 @@
  * Date: 2018/7/25
  * Time: 14:00
  */
+
 namespace Hdll\Services\SellerDistribution\Lib;
+
 use Swoft\Core\ResultInterface;
 
 /**
  * @method ResultInterface deferSaveBill($orderId, $sellerId, $money)
  * @method ResultInterface deferGetCommission($sellerId)
- * @method ResultInterface deferAddBalance($sellerId, $money, $orderSn='')
- * @method ResultInterface deferReduceBalance($sellerId, $money, $orderSn='')
- * @method ResultInterface deferListByOrderId($storeId, $orderId,$sellerId)
- * @method ResultInterface deferAddTotal($sellerId, $money, $orderSn='')
- * @method ResultInterface deferRefundAddBalance($sellerId, $money, $orderSn='')
+ * @method ResultInterface deferAddBalance($sellerId, $money, $orderSn = '')
+ * @method ResultInterface deferReduceBalance($sellerId, $money, $orderSn = '')
+ * @method ResultInterface deferListByOrderId($storeId, $orderId, $sellerId)
+ * @method ResultInterface deferAddTotal($sellerId, $money, $orderSn = '')
+ * @method ResultInterface deferRefundAddBalance($sellerId, $money, $orderSn = '')
  * @method ResultInterface deferCountVip($storeId, $sellerId)
+ * @method ResultInterface deferSumViewMoneyByStoreIds(array $storeIds)
  * Interface SellerDistributionInterface
  * @package App\Lib
  */
-interface SellerDistributionInterface{
+interface SellerDistributionInterface
+{
 
 
 	/**
@@ -53,7 +57,7 @@ interface SellerDistributionInterface{
 	 * @return mixed
 	 * @author Administrator
 	 */
-	public function addBalance($sellerId, $money, $orderSn='');
+	public function addBalance($sellerId, $money, $orderSn = '');
 
 	/**
 	 * 减少佣金
@@ -62,7 +66,7 @@ interface SellerDistributionInterface{
 	 * @return mixed
 	 * @author Administrator
 	 */
-	public function reduceBalance($sellerId, $money, $orderSn='');
+	public function reduceBalance($sellerId, $money, $orderSn = '');
 
 
 	/**
@@ -73,7 +77,7 @@ interface SellerDistributionInterface{
 	 * @return mixed
 	 * @author Administrator
 	 */
-	public function listByOrderId($storeId, $orderId,$sellerId);
+	public function listByOrderId($storeId, $orderId, $sellerId);
 
 	/**
 	 * 更细对账表
@@ -83,7 +87,7 @@ interface SellerDistributionInterface{
 	 * @return mixed
 	 * @author Administrator
 	 */
-	public function updateBill($storeId,$id,$balanceState);
+	public function updateBill($storeId, $id, $balanceState);
 
 	/**
 	 * 增加累计提现
@@ -92,7 +96,7 @@ interface SellerDistributionInterface{
 	 * @return mixed
 	 * @author Administrator
 	 */
-	public function addTotal($sellerId, $money, $orderSn='');
+	public function addTotal($sellerId, $money, $orderSn = '');
 
 
 	/**
@@ -102,7 +106,7 @@ interface SellerDistributionInterface{
 	 * @return mixed
 	 * @author Administrator
 	 */
-	public function refundAddBalance($sellerId, $money, $orderSn='');
+	public function refundAddBalance($sellerId, $money, $orderSn = '');
 
 
 	/**
@@ -113,4 +117,14 @@ interface SellerDistributionInterface{
 	 * @author Administrator
 	 */
 	public function countVip($storeId, $sellerId);
+
+	/**
+	 * 统计所有分销金额
+	 * @param array $storeIds
+	 * @return mixed
+	 * @author work
+	 */
+	public function sumViewMoneyByStoreIds(array $storeIds);
+
+
 }
\ No newline at end of file

src/TimesCard/Lib/TimesCardInterface.php

@@ -16,8 +16,8 @@ use Swoft\Core\ResultInterface;
 /**
  * The interface of demo service
  *
- * @method  ResultInterface deferpayStatus(int $storeId,int $bargainbranchId,int $status,int $orderId)
- * @method  ResultInterface deferspendTimesCard( int $storeId,int $buyerId,int $itemOrderId, int $usercardId,int $goodsId,string $itemTitle,  int $times)
+ * @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 defergetTimesCardUserCardInfo(int $storeId, int $goodsId)
  */
@@ -40,25 +40,14 @@ interface TimesCardInterface
 
     /**
      * 花费卡次数
-
-     * @param int $storeId          // 商铺id
-     * @param int $buyerId          // 买家ID
-     * @param int $itemOrderId      // 订单 id
-     * @param int $usercardId      // 用户卡id
-     * @param int $goodsId     // 商品id
-     * @param string $itemTitle   //商品名字
-     * @param int $times   // 花费次数  传 1
-     * @return mixed
+     *
+     * @param integer $storeId
+     * @param integer $buyerId
+     * @param integer $usercardId
+     * @param array $subOrders
+     * @return bool
      */
-    public function spendTimesCard(
-        int $storeId,
-        int $buyerId,
-        int $itemOrderId,
-        int $usercardId,
-        int $goodsId,
-        string $itemTitle,
-        int $times
-    );
+    public function spendTimesCard(int $storeId, int $buyerId, int $usercardId, array $subOrders);
 
     /**
      * 退回次卡数量