Merge branch 'zjl_discount_20190322' into development

app/Http/Controllers/AddOrderController.php

@@ -634,6 +634,8 @@ Class AddOrderController extends Controller
             $excel = $data->toArray();
         });
 
+        if (empty($excel)) return ['errcode' => 1, 'errmsg' => '未获取到模板内容，请检查模板内容数据格式'];
+
         $type = $request->input('type'); // 1.联营 2.自营
 
         if ($type == 1) {