修改服务商对应的控制器,model,service,factory

app/DischargeProvider.php → app/Facilitator.php

@@ -3,11 +3,12 @@
 namespace App;
 
 use App\Traits\ModelTimeFormat;
+use App\Traits\ModelLogChanging;
+
 use Illuminate\Database\Eloquent\Model;
 
-use App\Traits\ModelLogChanging;
 
-class DischargeProvider extends Model
+class Facilitator extends Model
 {
     use ModelLogChanging;
     use ModelTimeFormat;

app/Http/Controllers/DischargeProviderController.php

@@ -1,100 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use App\Components\AsyncResponse;
-use App\DischargeProvider;
-use App\DischargeTask;
-use App\Filters\DischargeTaskFilters;
-use App\Services\common\ExportService;
-use App\Services\DischargeTaskService;
-use Illuminate\Http\Request;
-
-class DischargeProviderController extends Controller
-{
-    use AsyncResponse;
-
-    // 服务商基础设置
-    public function index(Request $request)
-    {
-        // 权限 ***
-        $facilitators  = DischargeProvider::query()->select(['id','name','created_at'])->orderByDesc('id')->paginate($request['paginate'] ?? 50);
-        return view('maintenance.facilitator.index',compact('facilitators'));
-    }
-
-    // 服务商对账单
-    public function statementIndex(Request $request,DischargeTaskFilters $filters)
-    {
-        // 权限 ***
-        $providerStatements  = DischargeTask::query()->with('dischargeProvider')
-            ->select(['id','discharge_provider_id','expenditure_amount','expenditure_unit','expenditure_unit_price','expenditure_total_cost','expenditure_remark','created_at'])
-            ->filter($filters)->orderByDesc('id')->paginate($request['paginate'] ?? 50);
-        $providers = DischargeProvider::query()->get();
-        return view('transport.discharge.provider.index',compact('providerStatements','providers'));
-    }
-
-    public function create()
-    {
-        //
-    }
-
-    public function store(Request $request)
-    {
-        //
-    }
-
-    public function storeApi(Request $request)
-    {
-        // 权限 ***
-        $dischargeProvider = DischargeProvider::query()->create($request->all());
-        $this->success($dischargeProvider);
-    }
-
-    public function show(DischargeProvider $dischargeProvider)
-    {
-        //
-    }
-
-    public function edit(DischargeProvider $dischargeProvider)
-    {
-        //
-    }
-
-    public function update(Request $request, DischargeProvider $dischargeProvider)
-    {
-        //
-    }
-    public function updateApi(Request $request)
-    {
-        // 权限 ***
-        $dischargeProvider = DischargeProvider::query()->where('id',$request['id'])->update($request->only(['name']));
-        if($dischargeProvider)$this->success(DischargeProvider::query()->find($request['id']));
-        $this->error('更新失败');
-    }
-
-    public function destroy(DischargeProvider $dischargeProvider)
-    {
-        //
-
-    }
-
-    public function destroyApi(Request $request)
-    {
-         $count = $dischargeProvider = DischargeProvider::query()->where('id',$request['id'])->delete();
-        if($count>0)$this->success('删除成功');
-        $this->error('删除失败');
-    }
-
-    // 对账单导出
-    public function exportStatement(Request $request,DischargeTaskFilters $filters)
-    {
-        // 权限 ***
-        $dischargeTasks = DischargeTask::query()->with('dischargeProvider')
-            ->select(['id','discharge_provider_id','expenditure_amount','expenditure_unit','expenditure_unit_price','expenditure_total_cost','expenditure_remark','created_at'])
-            ->filter($filters)->orderByDesc('id')->get();
-        $row = ['日期','服务商','数量','单位','单价','总金额合计'];
-        $json = app('DischargeTaskService')->getStatementsJson($dischargeTasks);
-        return app(ExportService::class)->json($row,$json,"卸货结算报表");
-    }
-
-}

app/Http/Controllers/FacilitatorController.php

@@ -0,0 +1,100 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Components\AsyncResponse;
+use App\Facilitator;
+use App\DischargeTask;
+use App\Filters\DischargeTaskFilters;
+use App\Services\common\ExportService;
+use Illuminate\Http\Request;
+
+class FacilitatorController extends Controller
+{
+    use AsyncResponse;
+
+    // 服务商基础设置
+    public function index(Request $request)
+    {
+        // 权限 ***
+        $facilitators = Facilitator::query()->select(['id', 'name', 'created_at'])->orderByDesc('id')->paginate($request['paginate'] ?? 50);
+        return view('maintenance.facilitator.index', compact('facilitators'));
+    }
+
+    // 服务商对账单
+    public function statementIndex(Request $request, DischargeTaskFilters $filters)
+    {
+        // 权限 ***
+        $facilitatorStatements  = DischargeTask::query()->with('facilitator')
+            ->select(['id', 'discharge_provider_id', 'expenditure_amount', 'expenditure_unit', 'expenditure_unit_price', 'expenditure_total_cost', 'expenditure_remark', 'created_at'])
+            ->filter($filters)->orderByDesc('id')->paginate($request['paginate'] ?? 50);
+        $facilitators = Facilitator::query()->get();
+        return view('transport.discharge.facilitator.index', compact('facilitatorStatements', 'facilitators'));
+    }
+
+    public function create()
+    {
+        //
+    }
+
+    public function store(Request $request)
+    {
+        //
+    }
+
+    public function storeApi(Request $request)
+    {
+        // 权限 ***
+        $facilitator = Facilitator::query()->create($request->all());
+        $this->success($facilitator);
+    }
+
+    public function show(Facilitator $facilitator)
+    {
+        //
+    }
+
+    public function edit(Facilitator $facilitator)
+    {
+        //
+    }
+
+    public function update(Request $request, Facilitator $facilitator)
+    {
+        //
+    }
+
+    public function updateApi(Request $request)
+    {
+        // 权限 ***
+        $facilitator = Facilitator::query()->where('id', $request['id'])->update($request->only(['name']));
+        if ($facilitator) $this->success(Facilitator::query()->find($request['id']));
+        $this->error('更新失败');
+    }
+
+    public function destroy(Facilitator $facilitator)
+    {
+        //
+
+    }
+
+    public function destroyApi(Request $request)
+    {
+        $count = Facilitator::query()->where('id', $request['id'])->delete();
+        if ($count > 0) $this->success('删除成功');
+        $this->error('删除失败');
+    }
+
+    // 对账单导出
+    public function exportStatement(Request $request, DischargeTaskFilters $filters)
+    {
+        // 权限 ***
+        $dischargeTasks = DischargeTask::query()->with('facilitator')
+            ->select(['id', 'discharge_provider_id', 'expenditure_amount', 'expenditure_unit', 'expenditure_unit_price', 'expenditure_total_cost', 'expenditure_remark', 'created_at'])
+            ->filter($filters)->orderByDesc('id')->get();
+        $row = ['日期', '服务商', '数量', '单位', '单价', '总金额合计'];
+        $json = app('DischargeTaskService')->getStatementsJson($dischargeTasks);
+        return app(ExportService::class)->json($row, $json, "卸货结算报表");
+    }
+
+}

app/Services/DischargeProviderService.php

@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Services;
-
-use App\Traits\ServiceAppAop;
-use App\DischargeProvider;
-
-class DischargeProviderService
-{
-    use ServiceAppAop;
-    protected $modelClass=DischargeProvider::class;
-
-}

app/Services/FacilitatorService.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Services;
+
+use App\Traits\ServiceAppAop;
+use App\Facilitator;
+
+class FacilitatorService
+{
+    use ServiceAppAop;
+    protected $modelClass=Facilitator::class;
+
+}

database/factories/DischargeProviderFactory.php → database/factories/FacilitatorFactory.php

@@ -2,11 +2,11 @@
 
 /** @var Factory $factory */
 
-use App\DischargeProvider;
+use App\Facilitator;
 use Faker\Generator as Faker;
 use Illuminate\Database\Eloquent\Factory;
 
-$factory->define(DischargeProvider::class, function (Faker $faker) {
+$factory->define(Facilitator::class, function (Faker $faker) {
     return [
         'name' => $faker->name()
     ];

database/seeds/DischargeProviderSeeder.php

@@ -1,18 +0,0 @@
-<?php
-
-use App\DischargeProvider;
-use Illuminate\Database\Seeder;
-
-class DischargeProviderSeeder extends Seeder
-{
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        $params = factory(DischargeProvider::class)->times(10)->make()->toArray();
-        DischargeProvider::query()->insert($params);
-    }
-}

database/seeds/FacilitatorSeeder.php

@@ -0,0 +1,18 @@
+<?php
+
+use App\Facilitator;
+use Illuminate\Database\Seeder;
+
+class FacilitatorSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        $params = factory(Facilitator::class)->times(10)->make()->toArray();
+        Facilitator::query()->insert($params);
+    }
+}