diff --git a/app/Forms/ProjectForm.php b/app/Forms/ProjectForm.php index 84de7c2..503192a 100755 --- a/app/Forms/ProjectForm.php +++ b/app/Forms/ProjectForm.php @@ -13,6 +13,7 @@ class ProjectForm extends Form $this->add("longitude", Field::HIDDEN); $this->add("name", Field::TEXT, ["label" => "名称", "rules" => "required"]); $this->add("address", Field::TEXT, ["label" => "地址", "rules" => "required"]); + $this->add("percent_first_party", Field::NUMBER, ["label" => "院方结算百分比"]); $this->add("logo", Field::TEXT, ["label" => "logo", "attr" => ["data-plugin" => "uploader"]]); $this->add("banners", Field::TEXT, ["label" => "banner", "attr" => ["data-plugin" => "uploader", "data-multiple-multiple" => 1]]); $this->add("profile", Field::TEXTAREA, ["label" => "简介"]); diff --git a/app/Http/Controllers/Customer/OrdersController.php b/app/Http/Controllers/Customer/OrdersController.php index bd4d70e..4be4b2e 100644 --- a/app/Http/Controllers/Customer/OrdersController.php +++ b/app/Http/Controllers/Customer/OrdersController.php @@ -505,6 +505,7 @@ class OrdersController extends CommonController public function cancelOrder($id) { $order = (new Orders())->with("orderItems")->find($id); + \Log::info($order); if ($order->status !== Orders::STATUS_UNCONFIRMED) { return response()->json([ "errorcode" => 50001, diff --git a/database/migrations/2023_07_16_144532_update_project_add_percent_first_party.php b/database/migrations/2023_07_16_144532_update_project_add_percent_first_party.php new file mode 100644 index 0000000..6a5f14a --- /dev/null +++ b/database/migrations/2023_07_16_144532_update_project_add_percent_first_party.php @@ -0,0 +1,30 @@ +decimal("percent_first_party", 5, 2)->nullable(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } +} diff --git a/resources/views/admin/project/index.blade.php b/resources/views/admin/project/index.blade.php index 11e2cb7..8f39fdc 100755 --- a/resources/views/admin/project/index.blade.php +++ b/resources/views/admin/project/index.blade.php @@ -18,6 +18,7 @@ {{$modelName}} 地址 + 项目结算比例 操作 @@ -28,6 +29,7 @@ {{ $row->name }} {{ $row->address }} + {{ $row->percent_first_party }} 床位管理 diff --git a/resources/views/admin/statistics/overview.blade.php b/resources/views/admin/statistics/overview.blade.php index cd2c126..1f9dfb4 100755 --- a/resources/views/admin/statistics/overview.blade.php +++ b/resources/views/admin/statistics/overview.blade.php @@ -35,6 +35,7 @@ 本月退款 本月结算 本月未结算余额 + 院方结算 @@ -46,6 +47,7 @@ {{ $this_month_balances->filter(function($item) { return $item->belongs_type == "App\Models\Refund"; })->sum("money") }} {{ $this_month_balances->filter(function($item) { return $item->belongs_type == "App\Models\OrderItems"; })->sum("money") }} {{ $this_month_balance }} + @if($project->percent_first_party){{ -$this_month_balances->filter(function($item) { return $item->belongs_type == "App\Models\OrderItems"; })->sum("money") * $project->percent_first_party / 100 }}@else{{ "未设置" }}@endif