Merge branch 'fuyunnan'

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

src/Service/Interfaces/DispatchPlanServiceInterface.php

@@ -17,11 +17,11 @@ interface DispatchPlanServiceInterface
      * description:获取退税任务列表
      * author: fuyunnan
      * @param array $conditions 筛选条件
-	 * @param Integer $pageSize 默认10
+     * @param Integer $pageSize 默认10
      * Date: 2020/6/13
      * @return array
      */
-    public function listRefundTasks(array $conditions, Integer $pageSize) : array;
+    public function listRefundTasks(array $conditions = [], Integer $pageSize): array;
 
     /**
      * description:新建退税单 获取底部产品列表
@@ -31,17 +31,28 @@ 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;
 
 
-     /**
-      * description:删除退税任务
-      * author: fuyunnan
-      * @param int $id 计划任务id
-      * Date: 2020/6/13
-      * @return bool
-      */
-    public function delete($id) :bool;
+    /**
+     * description:删除退税任务
+     * author: fuyunnan
+     * @param int $id 计划任务id
+     * Date: 2020/6/13
+     * @return 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;
 
 
 }