Merge branch 'xmy' of http://git.dev.2b3.cn/tencent/services into xmy

src/Order/Lib/OrderInterface.php

@@ -18,7 +18,7 @@ use Swoft\Core\ResultInterface;
  * @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 deferGetOrderDetailBySubId(int $storeId,int $subOrderId,$ifSelf=true,bool $ifExtend=false)
  * @method ResultInterface deferGetOrderDetailByPid(int $storeId,int $pId, $ifSelf=false, $ifExtend=false)
- * @method ResultInterface deferGetSubOrderBySubId(int $storeId, int $subOrderId)
+ * @method ResultInterface deferGetOrderDetailByMainSn(int $storeId,string  $orderSn, $ifSelf=false, $ifExtend=false)
  * 
  * @method ResultInterface deferUpdateInfoById(int $storeId,int $orderId, array  $updateInfo)
  * @method ResultInterface deferGetSimpleList($storeId, $condition, $fields = ['*'])
@@ -70,14 +70,6 @@ interface OrderInterface
         int $subStoreId=0,
         int $couponId=0
     );
-   /**
-    * 根据子订单ID只查询子订单信息
-    *
-    * @param integer $storeId 店铺ID
-    * @param integer $subOrderId 子订单ID
-    * @return array
-    */
-    public function getSubOrderBySubId(int $storeId, int $subOrderId);
     /**
     * 根据子订单ID查询订单详情
     *
@@ -98,7 +90,16 @@ interface OrderInterface
     */
     public function getOrderDetailByPid(int $storeId,int $pId, $ifSelf=false, $ifExtend=false);
     
-    public function getOrderInfoBySn(int $storeId, string $orderSn, array $consigneeFields = [], array $itemFields = []);
+    /**
+    * 通过订主单orderSn获取订单信息
+    *
+    * @param integer $storeId
+    * @param string $orderSn
+    * @param boolean $ifSelf 是否只有主订单信息
+    * @param boolean $ifExtend 是否涵带附加信息（如门店信息、上级信息等）
+    * @return array
+    */
+    public function getOrderDetailByMainSn(int $storeId,string  $orderSn, $ifSelf=false, $ifExtend=false);
 
     public function updateInfoById(int $storeId,int $orderId, array  $updateInfo);