Merge remote-tracking branch 'origin/master'

src/Bargain/Enum/BargainEnum.php

@@ -15,4 +15,10 @@ class BargainEnum
     const STATUS_NORMAL = 10; //待支付
     const STATUS_NORMAL = 10; //待支付
 
 
 
 
+
+    //paystatus
+    const HAVE_PAY =2;
+    const PAY_EXCEPTION = 3;
+    
+
 }
 }
\ No newline at end of file

src/Bargain/Lib/BargainInterface.php

@@ -10,14 +10,14 @@
 
 
 namespace Hdll\Services\Bargain\Lib;
 namespace Hdll\Services\Bargain\Lib;
 
 
+use Hdll\Services\Bargain\Enum\BargainEnum;
 use Swoft\Core\ResultInterface;
 use Swoft\Core\ResultInterface;
 
 
 /**
 /**
  * The interface of demo service
  * The interface of demo service
  *
  *
- * @method  ResultInterface deferGetgoodsinfo( int $limit_id)
- * @method  ResultInterface deferGetBargainInfo( int $limit_id)
-
+ * @method  ResultInterface deferGetgoodsinfo(int $limit_id)
+ * @method  ResultInterface deferGetBargainInfo(int $limit_id)
  */
  */
 interface BargainInterface
 interface BargainInterface
 {
 {
@@ -26,18 +26,17 @@ interface BargainInterface
      *  获取砍价商品的 商品信息
      *  获取砍价商品的 商品信息
      * @param int $bargain_id
      * @param int $bargain_id
      * @return {
      * @return {
-            "name"              名称
-            "image"             图片
-            "price"             价格
-            "activityName"      活动名称
+     * "name"              名称
+     * "image"             图片
+     * "price"             价格
+     * "activityName"      活动名称
      * }
      * }
      */
      */
     public function getGoodsInfo(
     public function getGoodsInfo(
-       int $stordId,int $bargain_id
+        int $stordId, int $bargain_id
     );
     );
 
 
 
 
-
     /**
     /**
      * 通过商品id  获取是否 有砍价活动
      * 通过商品id  获取是否 有砍价活动
      * @param int $storeId
      * @param int $storeId
@@ -46,9 +45,22 @@ interface BargainInterface
      *
      *
      */
      */
     public function getBargainInfo(
     public function getBargainInfo(
-        int $storeId,int $goodsId
+        int $storeId, int $goodsId
     );
     );
 
 
+
+    /**
+     * 支付 状态 回馈接口
+     * @param string $storeId //
+     * @param int $bargainbranchId // 砍价活动id
+     * @param int $status // BargainEnum::HAVE_PAY 成功支付  BargainEnum::PAY_EXCEPTION：未支付 （已经过期或者支付异常）
+     * @return mixed
+     */
+    public function payStatus(
+        string $storeId,
+        int $bargainbranchId,
+        int $status ,  //
+        int $orderId);
 }
 }
 
 
 
 

src/LimitTimeBuy/Lib/LimitTimeBuyInterface.php

@@ -44,10 +44,10 @@ interface LimitTimeBuyInterface
      *  获取限时购商品的 商品信息
      *  获取限时购商品的 商品信息
      * @param int $limit_id
      * @param int $limit_id
      * @return {
      * @return {
-            "name"              名称
-            "image"             图片
-            "price"             价格
-            "activityName"      活动名称
+     * "name"              名称
+     * "image"             图片
+     * "price"             价格
+     * "activityName"      活动名称
      * }
      * }
      */
      */
     public function getLimitGoods(
     public function getLimitGoods(
@@ -66,4 +66,16 @@ interface LimitTimeBuyInterface
     );
     );
 
 
 
 
+//    /**
+//     * 支付 状态 回馈接口
+//     * @param string $store_id
+//     * @param int $limit_id
+//     * @param int $status // status :1 成功支付  2：未支付 （已经过期或者支付异常）
+//     * @return mixed
+//     */
+//    public function paystatus(
+//        string $store_id,
+//        int $limit_id,
+//        int $status,
+//        int $orderId);
 }
 }
\ No newline at end of file

src/Notice/Common/WxMiniNotice.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: Administrator
+ * Date: 2018/9/4
+ * Time: 10:46
+ */
+namespace Hdll\Services\Notice\Common;
+
+class WxMiniNotice
+{
+    /**
+     * 微信小程序page生成
+     *
+     * 用法：
+     * WxMiniNotice::generatePage("pages/orderShow/orderShow",['orderId' => $orderInfo['id'], 'storeId' => $orderInfo['storeId']])
+     * 生成
+     *  pages/orderShow/orderShow?orderId=1&storeId=7
+     * @param string $page
+     * @param array $param
+     * @return string
+     */
+    public static function generatePage(string $page, array $param)
+    {
+        $param['origin'] = $param['origin']??'notice';
+
+        $param = http_build_query($param);
+
+        return $page.$param;
+    }
+
+}
\ No newline at end of file

src/Order/Lib/OrderInterface.php

@@ -15,7 +15,7 @@ use Swoft\Core\ResultInterface;
 /**
 /**
  * The interface of demo service
  * 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 deferGetOrderInfoBySn(int $storeId, string $orderSn)
  * @method ResultInterface deferGetOrderInfo(int $storeId,int $orderId)
  * @method ResultInterface deferGetOrderInfo(int $storeId,int $orderId)
  * @method ResultInterface deferUpdateInfoById(int $storeId,int $orderId, array  $updateInfo)
  * @method ResultInterface deferUpdateInfoById(int $storeId,int $orderId, array  $updateInfo)
@@ -27,34 +27,37 @@ interface OrderInterface
 {
 {
     /**
     /**
      * 创建订单
      * 创建订单
+     *
      * @param int $buyerId
      * @param int $buyerId
      * @param int $storeId
      * @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
      * @param string $reservation_time
      * @return mixed
      * @return mixed
      */
      */
     public function createOrder(
     public function createOrder(
         int $buyerId,
         int $buyerId,
         int $storeId,
         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 $goodsId,
+        int $goodsPrice,
         string $reservation_time = '');
         string $reservation_time = '');
 
 
     public function getOrderInfo(int $storeId,int $orderId);
     public function getOrderInfo(int $storeId,int $orderId);