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

src/Order/Lib/OrderInterface.php

@@ -16,7 +16,9 @@ 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 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)
@@ -68,8 +70,26 @@ interface OrderInterface
         int $couponId=0
         int $couponId=0
     );
     );
 
 
-    public function getOrderInfo(int $storeId,int $orderId);
-
+    /**
+    * 根据子订单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);