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

src/Order/Lib/OrderInterface.php

@@ -13,18 +13,18 @@ namespace Hdll\Services\Order\Lib;
 use Swoft\Core\ResultInterface;
 
 /**
- * The interface of demo service
+ * order servcie
  *
  * @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 deferGetOrderDetailByMainSn(int $storeId,string  $orderSn, $ifSelf=false, $ifExtend=false)
- * @method ResultInterface deferUpdateMainOrderByPid(int $storeId,int $pId,array $mainData,array $subData=[])
  * @method ResultInterface deferUpdateInfoById(int $storeId,int $orderId, array  $updateInfo)
  * @method ResultInterface deferUpdateInfoByIds(int $storeId,array $orderIds, array  $updateInfo)
- * @method ResultInterface deferCollectionClose(int $storeId, int $orderId)
- * @method ResultInterface deferGetSubOrderListBySubIds(int $storeId,array $subIds)
+ * @method ResultInterface deferUpdateInfoByPids(int $storeId,array $pIds,array $updateInfo)
+ * @method ResultInterface deferUpdateMainOrderByPid(int $storeId,int $pId,array $mainData,array $subData=[])
  * @method ResultInterface deferUnconfirmedCount(int $storeId)
+ * @method ResultInterface deferGetSubOrderListBySubIds(int $storeId,array $subIds)
  */
 interface OrderInterface
 {
@@ -99,24 +99,34 @@ interface OrderInterface
     public function getOrderDetailByMainSn(int $storeId,string  $orderSn, $ifSelf=false, $ifExtend=false);
 
     /**
-     * 根据订单ID更新子订单信息
+     * 根据子订单ID更新子订单信息
      *
      * @param integer $storeId
-     * @param integer $orderId
+     * @param integer $subId
      * @param array $updateInfo
-     * @return mixed
+     * @return int
      */
-    public function updateInfoById(int $storeId,int $orderId, array  $updateInfo);
+    public function updateInfoById(int $storeId,int $subId, array  $updateInfo);
 
     /**
-     * 批量更新
+     * 根据子订单ID批量更新子订单信息
      *
      * @param int $storeId
-     * @param array $orderIds
+     * @param array $subIds
      * @param array $updateInfo
-     * @return mixed
+     * @return int
      */
-    public function updateInfoByIds(int $storeId,array $orderIds, array  $updateInfo);
+    public function updateInfoByIds(int $storeId,array $subIds, array  $updateInfo);
+
+    /**
+     * 根据主订单ID批量更新子订单信息
+     * 
+     * @param integer $storeId
+     * @param array $pIds
+     * @param array $updateInfo
+     * @return int
+     */
+    public function updateInfoByPids(int $storeId,array $pIds,array $updateInfo);
 
     /**
      * 根据主订单ID更新订单信息
@@ -128,25 +138,7 @@ interface OrderInterface
      * @return bool
      */
     public function updateMainOrderByPid(int $storeId,int $pId,array $mainData,array $subData=[]);
-
-    /**
-     * 退款成功
-     *
-     * @param int $storeId
-     * @param array $orderInfo
-     * @return mixed
-     */
-    public function refundSuccess(int $storeId, array $orderInfo);
-
-    /**
-     * 拼团关闭订单，含退款
-     *
-     * @param int $storeId
-     * @param int $orderId
-     * @return mixed
-     */
-    public function collectionClose(int $storeId, int $orderId);
-
+    
     /**
      * 获取未入账统计
      * @param int $storeId
@@ -159,7 +151,7 @@ interface OrderInterface
      *
      * @param integer $storeId
      * @param array $subIds
-     * @return void
+     * @return array
      */
     public function getSubOrderListBySubIds(int $storeId,array $subIds);
 }
\ No newline at end of file