Merge remote-tracking branch 'origin/master'

src/GroupBooking/Lib/GroupBookingInterface.php

@@ -23,4 +23,14 @@ interface GroupBookingInterface{
 
 
 	public function hasActivity($storeId,$goodsId);
+
+	/**
+	 * 关闭拼团
+	 * @param $storeId
+	 * @param $buyerId
+	 * @param $orderId
+	 * @return mixed
+	 * @author Administrator
+	 */
+	public function closeRecord($storeId, $buyerId, $orderId);
 }
\ No newline at end of file

src/Notice/Lib/NoticeInterface.php

@@ -15,7 +15,7 @@ use Swoft\Core\ResultInterface;
 /**
  * The interface of demo service
  *
- * @method ResultInterface deferSend(int $sendType, array $data, int $sendTime)
+ * @method ResultInterface deferSend(int $storeId, array $sendTypes, array $data, int $sendTime) :bool
  */
 interface NoticeInterface
 {
@@ -25,6 +25,7 @@ interface NoticeInterface
      * 微信发送消息数据结构
      * $data[NoticeEnum::TYPE_MINI_BACKEND_SEND] = [
         "uid" => 1, //用户的id
+     *  "storeId" => 1, //店铺id
         "template_id" => "1kZ_RkkWfRrpufXNdmJYBpIhgk7ccCtPrypeJQ9WRwM",//消息模板id
         "page" => "index", //消息模板页面
         "data" => [ //消息模板数据
@@ -62,5 +63,5 @@ interface NoticeInterface
      * @param int $sendTime   //发送时间，立即返送填0
      * @return mixed
      */
-    public function send(array $sendTypes, array $data, int $sendTime) : bool ;
+    public function send(array $sendTypes, array $data, int $sendTime) :bool;
 }
\ No newline at end of file

src/Order/Lib/OrderInterface.php

@@ -16,12 +16,13 @@ use Swoft\Core\ResultInterface;
  * The interface of demo service
  *
  * @method ResultInterface deferCreateOrder(int $buyerId,int $storeId,int $consigneeId,int $itemId,int $selectedNum,int $orderType,int $total,int $activityPrice,string $goodsName,string $goodsImage,string $activityName,int $goodsId,int $goodsPrice,string $reservation_time = '');
- * @method ResultInterface deferGetOrderInfoBySn(int $storeId, string $orderSn)
+ * @method ResultInterface deferGetOrderInfoBySn(int $storeId, string $orderSn, array $consigneeFields = [], array $itemFields = [])
  * @method ResultInterface deferGetOrderInfo(int $storeId,int $orderId)
  * @method ResultInterface deferUpdateInfoById(int $storeId,int $orderId, array  $updateInfo)
  * @method ResultInterface deferGetSimpleList($storeId, $condition, $fields = ['*'])
  * @method ResultInterface deferUpdateInfoByIds(int $storeId,array $orderIds, array  $updateInfo)
- * @method ResultInterface deferCollectionClose(int $storeId, int $orderId);
+ * @method ResultInterface deferCollectionClose(int $storeId, int $orderId)
+ * @method ResultInterface deferGetOtherInfo(int $storeId, string $orderSn, array $consigneeFields = [], array $itemFields = [])
  */
 interface OrderInterface
 {
@@ -62,7 +63,7 @@ interface OrderInterface
 
     public function getOrderInfo(int $storeId,int $orderId);
 
-    public function getOrderInfoBySn(int $storeId, string $orderSn);
+    public function getOrderInfoBySn(int $storeId, string $orderSn, array $consigneeFields = [], array $itemFields = []);
 
     public function updateInfoById(int $storeId,int $orderId, array  $updateInfo);
 
@@ -135,4 +136,15 @@ interface OrderInterface
      */
     public function updateInfoByIds(int $storeId,array $orderIds, array  $updateInfo);
 
+    /**
+     * 获取订单联系人信息，item信息用
+     *
+     * @param int $storeId
+     * @param string $orderSn
+     * @param array $consigneeFields
+     * @param array $itemFields
+     * @return mixed
+     */
+    public function getOtherInfo(int $storeId, string $orderSn, array $consigneeFields = [], array $itemFields = []);
+
 }
\ No newline at end of file