Merge branch 'fuyunnan'

# Conflicts:
#	src/Service/Interfaces/DispatchPlanServiceInterface.php

src/Service/Interfaces/DispatchPlanServiceInterface.php

@@ -21,7 +21,7 @@ interface DispatchPlanServiceInterface
      * Date: 2020/6/13
      * @return array
      */
-    public function listRefundTasks(array $conditions, Integer $pageSize) : array;
+    public function listRefundTasks(array $conditions = [], Integer $pageSize): array;
 
     /**
      * description:新建退税单 获取底部产品列表
@@ -31,7 +31,7 @@ interface DispatchPlanServiceInterface
      * Date: 2020/6/13
      * @return array
      */
-    public function listRefundProducts(array $conditions = [], Integer $pageSize = 10 ) :array;
+    public function listRefundProducts(array $conditions = [], Integer $pageSize) :array;
 
 
     /**
@@ -41,7 +41,18 @@ interface DispatchPlanServiceInterface
      * Date: 2020/6/13
      * @return bool
      */
-    public function delete($id) :bool;
+    public function delete($id): bool;
+
+
+    /**
+     * description:获取发货计划详情
+     * author: fuyunnan
+     * @param array $idList
+     * @param array $conditions 将参数条件写成二维数组形式 $conditions = [ ['id','=',1],['name','=',''jack] ]
+     * Date: 2020/6/13
+     * @return array
+     */
+    public function getDispatch(array $idList, array $conditions = []):array;
 
 
 }