Merge branch 'master' of http://git.2b3.cn/tencent/services

src/Notice/Lib/NoticeInterface.php

@@ -46,15 +46,16 @@ interface NoticeInterface
 
      *
      * 短信发送消息数据结构
-        $data[NoticeEnum::TENCENT_SMS] = [
+    $data[NoticeEnum::TYPE_TENCENT_SMS] = [
+        [
             "templateId" => "178822", //模板id
-            "phoneNumber" => "18812345678",
-                "param" => [ //模板变量名
+            "phoneNumber" => "17558430002",
+            "param" => [ //模板变量名
                 "1580",
                 "5"
             ]
-
-        ];
+        ]
+    ];
      *
      * @param array $sendTypes
      * @param array $data

src/Order/Lib/OrderInterface.php

@@ -15,7 +15,7 @@ use Swoft\Core\ResultInterface;
 /**
  * The interface of demo service
  *
- * @method ResultInterface deferCreateOrder(  string $token,int $consignee_id,int $activity_id,int $selected_num,int $order_type,float $total,float $goods_price,string $goods_name,string $goods_image,string $activity_name,int $goodsId,string $reservation_time = '')
+ * @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 deferGetOrderInfo(int $storeId,int $orderId)
  * @method ResultInterface deferUpdateInfoById(int $storeId,int $orderId, array  $updateInfo)
@@ -27,34 +27,37 @@ interface OrderInterface
 {
     /**
      * 创建订单
+     *
      * @param int $buyerId
      * @param int $storeId
-     * @param int $consignee_id
-     * @param int $item_id
-     * @param int $selected_num
-     * @param int $order_type
-     * @param float $total
-     * @param float $goods_price
-     * @param string $goods_name
-     * @param string $goods_image
-     * @param string $activity_name
-     * @param int $goodsId,
+     * @param int $consigneeId
+     * @param int $itemId
+     * @param int $selectedNum
+     * @param int $orderType
+     * @param int $total
+     * @param int $activityPrice
+     * @param string $goodsName
+     * @param string $goodsImage
+     * @param string $activityName
+     * @param int $goodsId
+     * @param int $goodsPrice
      * @param string $reservation_time
      * @return mixed
      */
     public function createOrder(
         int $buyerId,
         int $storeId,
-        int $consignee_id,
-        int $item_id,
-        int $selected_num,
-        int $order_type,
-        float $total,
-        float $goods_price,
-        string $goods_name,
-        string $goods_image,
-        string $activity_name,
+        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 = '');
 
     public function getOrderInfo(int $storeId,int $orderId);