Merge branch 'frontmoney' into test

src/FrontMoney/Lib/FrontMoneyInterface.php

@@ -16,10 +16,10 @@ use Swoft\Core\ResultInterface;
 /**
  * The interface of demo service
  *
- * @method  ResultInterface deferBackNum(string $token, int $consignee_id, int $front_id, int $selected_num, int $order_type, int $goods_id, string $reservation_time = '')
+ * @method  ResultInterface deferBackNum(string $token, int $consigneeId, int $frontId, int $selectedNum, int $orderType, int $goodsId, string $reservationTime = '')
  * @method ResultInterface deferGetFrontGoods(int $storeId, int $frontId)
  * @method ResultInterface deferGetFrontInfo(int $storeId, int $goodsId)
- * @method ResultInterface deferPayStatus(string $store_id,int $front_id, int $status, int $orderId)
+ * @method ResultInterface deferPayStatus(string $storeId,int $frontId, int $status, int $orderId)
  * @method  ResultInterface deferGetFrontCounts(int $storeId)
  * @method ResultInterface deferGetNewOrderNum(int $storeId,int $lastTime)
  */
@@ -37,14 +37,8 @@ interface FrontMoneyInterface
      * @param string $reservation_time
      * @return mixed
      */
-    public function backNum(
-        string $token,
-        int $consignee_id,
-        int $front_id,
-        int $selected_num,
-        int $order_type,
-        int $goods_id,
-        string $reservation_time);
+    public function backNum(string $token, int $consigneeId, int $frontId, int $selectedNum, int $orderType, int $goodsId, string $reservationTime = '');
+      
 
     /**
      *  获取定金商品的 商品信息
@@ -77,7 +71,7 @@ interface FrontMoneyInterface
      * @return bool|mixed
      * @throws ConException
      */
-    public function payStatus(string $store_id,int $front_id,int $status, int $orderId);
+    public function payStatus(string $storeId,int $frontId, int $status, int $orderId);
 
     /**
      * 获取定金活动总个数 和正在进行的个数