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

src/Bargain/Enum/BargainEnum.php

@@ -13,14 +13,13 @@ class BargainEnum
   
     //订单状态
     const STATUS_NORMAL = 10; //待支付
-    const STATUS_IN_MINI_PRICE = 20; //已经到底价
-    const STATUS_HAVE_ORDER = 30; //已经下单
-    const STATUS_HAVE_BUY = 40; //已经购买
+
 
 
     //paystatus
     const HAVE_PAY =2;
     const PAY_EXCEPTION = 3;
+    const PAY_REFUND = 4;   // 退款
     
 
 }
\ No newline at end of file

src/LimitTimeBuy/Enum/LimitTimeOrderEnum.php

@@ -8,11 +8,8 @@ class LimitTimeOrderEnum
 
     //订单状态
     const STATUS_NORMAL = 1; //待支付  1未支付2已经支付3异常
-    const STATUS_HAVE_PAY =2;
-    const STATUS_PAY_EXCEPTION =3;
-
-
-
-
+    const STATUS_HAVE_PAY =2;  // 已经支付
+    const STATUS_PAY_EXCEPTION =3;  // 支付异常或过期未付
+    const STATUS_PAY_REFUND =4 ; // 退款
 
 }
\ No newline at end of file

src/LimitTimeBuy/Lib/LimitTimeBuyInterface.php

@@ -71,7 +71,7 @@ interface LimitTimeBuyInterface
      * 支付 状态 回馈接口
      * @param string $store_id
      * @param int $limit_id
-     * @param int $status // 2.LimitTimeOrderEnum::STATUS_HAVE_PAY 成功支付  3：LimitTimeOrderEnum::STATUS_PAY_EXCEPTION 未支付 （已经过期或者支付异常）
+     * @param int $status // 2.LimitTimeOrderEnum::STATUS_HAVE_PAY 成功支付  3：LimitTimeOrderEnum::STATUS_PAY_EXCEPTION 未支付 （已经过期或者支付异常）4 LimitTimeOrderEnum::STATUS_PAY_REFUND  退款
      * @param int $orderId
      * @return bool|mixed
      * @throws ConException