Merge remote-tracking branch 'origin/xmy' into xmy

src/Order/Lib/OrderInterface.php

@@ -16,7 +16,10 @@ use Swoft\Core\ResultInterface;
  * The interface of demo service
  * The interface of demo service
  *
  *
  * @method ResultInterface deferCreateOrder(int $buyerId,int $storeId,int $consigneeId,int $itemId,int $selectedNum,int $orderType,int $activityPrice,string $goodsName,string $goodsImage,string $activityName,int $goodsId,int $goodsPrice,string $message='',int $skuId=0,int $subStoreId=0,int $couponId=0);
  * @method ResultInterface deferCreateOrder(int $buyerId,int $storeId,int $consigneeId,int $itemId,int $selectedNum,int $orderType,int $activityPrice,string $goodsName,string $goodsImage,string $activityName,int $goodsId,int $goodsPrice,string $message='',int $skuId=0,int $subStoreId=0,int $couponId=0);
- * @method ResultInterface deferGetOrderInfo(int $storeId,int $orderId)
+ * @method ResultInterface deferGetOrderDetailBySubId(int $storeId,int $subOrderId,$ifSelf=true,bool $ifExtend=false)
+ * @method ResultInterface deferGetOrderDetailByPid(int $storeId,int $pId,bool $ifExtend=false)
+ * @method ResultInterface deferGetSubOrderBySubId(int $storeId, int $subOrderId)
+ * 
  * @method ResultInterface deferUpdateInfoById(int $storeId,int $orderId, array  $updateInfo)
  * @method ResultInterface deferUpdateInfoById(int $storeId,int $orderId, array  $updateInfo)
  * @method ResultInterface deferGetSimpleList($storeId, $condition, $fields = ['*'])
  * @method ResultInterface deferGetSimpleList($storeId, $condition, $fields = ['*'])
  * @method ResultInterface deferUpdateInfoByIds(int $storeId,array $orderIds, array  $updateInfo)
  * @method ResultInterface deferUpdateInfoByIds(int $storeId,array $orderIds, array  $updateInfo)
@@ -67,9 +70,34 @@ interface OrderInterface
         int $subStoreId=0,
         int $subStoreId=0,
         int $couponId=0
         int $couponId=0
     );
     );
-
-    public function getOrderInfo(int $storeId,int $orderId);
-
+   /**
+    * 根据子订单ID只查询子订单信息
+    *
+    * @param integer $storeId 店铺ID
+    * @param integer $subOrderId 子订单ID
+    * @return array
+    */
+    public function getSubOrderBySubId(int $storeId, int $subOrderId);
+    /**
+    * 根据子订单ID查询订单详情
+    *
+    * @param integer $storeId 店铺ID
+    * @param integer $subOrderId 子订单ID
+    * @param boolean $ifSelf  子订单是否只有自己
+    * @param boolean $ifExtend 是否涵带附加信息（如门店信息、上级信息等）
+    * @return array
+    */
+    public function getOrderDetailBySubId(int $storeId,int $subOrderId,$ifSelf=true,bool $ifExtend=false);
+    /**
+    * 根据主订单ID查询订单详情
+    *
+    * @param integer $storeId 店铺ID
+    * @param integer $pId 主订单ID
+    * @param boolean $ifExtend 是否涵带附加信息（如门店信息、上级信息等）
+    * @return array
+    */
+    public function getOrderDetailByPid(int $storeId,int $pId,bool $ifExtend=false);
+    
     public function getOrderInfoBySn(int $storeId, string $orderSn, array $consigneeFields = [], array $itemFields = []);
     public function getOrderInfoBySn(int $storeId, string $orderSn, array $consigneeFields = [], array $itemFields = []);
 
 
     public function updateInfoById(int $storeId,int $orderId, array  $updateInfo);
     public function updateInfoById(int $storeId,int $orderId, array  $updateInfo);

src/Pay/Enum/PayClientEnum.php

+<?php
+namespace Hdll\Services\Pay\Enum;
+
+class PayClientEnum 
+{
+    const BUYER_MINI_PROGRAM = 1;//买家小程序
+    const SELLER_MINI_PROGRAM = 2;//卖家小程序
+    const SELLER_MP = 3;//卖家公众号
+
+    
+}
\ No newline at end of file

src/SMS/Lib/SMSInterface.php

+<?php
+
+/**
+ * This file is part of Swoft.
+ *
+ * @link https://swoft.org
+ * @document https://doc.swoft.org
+ * @contact group@swoft.org
+ * @license https://github.com/swoft-cloud/swoft/blob/master/LICENSE
+ */
+
+ 
+
+namespace Hdll\Services\SMS\Lib;
+
+use Swoft\Core\ResultInterface;
+
+/**
+ * The interface of SMS service
+ *
+ * @method ResultInterface deferCreateCost(int $storeId,string $scene,int $decnum,string $nickname,string $phone)
+ * @method ResultInterface deferPayOrder(string $orderNo,int $payStatus) 
+ * @method ResultInterface deferGetOrder(int $storeId,int $smsOId)
+ * @method ResultInterface deferGetOrderBySn(int $storeId,string $sn)
+ */
+interface SMSInterface
+{ 
+    /**
+     * 消费短信
+     *
+     * @param integer $storeId
+     * @param string $scene
+     * @param integer $decnum
+     * @param string $nickname
+     * @param string $phone
+     * @return int
+     */
+    public function createCost(int $storeId,string $scene,int $decnum,string $nickname,string $phone);
+
+
+
+
+    /**
+     * 支付短信套餐包订单
+     *
+     * @param string $orderNo
+     * @param integer $payStatus
+     * @return int
+     */
+    public function payOrder(string $orderNo,int $payStatus);
+
+     /**
+     * 根据主键获取短信订单
+     * @param integer $storeId
+     * @param integer $smsOId
+     * @return array
+     */
+    public function getOrder(int $storeId,int $smsOId);
+
+    /**
+     * 根据订单编号获取短信订单
+     *
+     * @param integer $storeId
+     * @param string $sn
+     * @return array
+     */
+    public function getOrderBySn(int $storeId,string $sn);
+    
+}