From 852f3623a37d11605c33dd21127092bb9aeb6778 Mon Sep 17 00:00:00 2001 From: weizong song Date: Mon, 8 Apr 2024 10:47:27 +0800 Subject: [PATCH 01/10] up --- app/Http/Controllers/Manager/StatisticsController.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Http/Controllers/Manager/StatisticsController.php b/app/Http/Controllers/Manager/StatisticsController.php index 6841254..502d591 100644 --- a/app/Http/Controllers/Manager/StatisticsController.php +++ b/app/Http/Controllers/Manager/StatisticsController.php @@ -347,3 +347,5 @@ class StatisticsController extends CommonController return [$from_date, $to_date]; } } + + From b7752a0eb46bd28581e8d5e839242da4817206fb Mon Sep 17 00:00:00 2001 From: weizong song Date: Mon, 8 Apr 2024 10:48:28 +0800 Subject: [PATCH 02/10] up --- app/Http/Controllers/Manager/StatisticsController.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/Http/Controllers/Manager/StatisticsController.php b/app/Http/Controllers/Manager/StatisticsController.php index 502d591..6841254 100644 --- a/app/Http/Controllers/Manager/StatisticsController.php +++ b/app/Http/Controllers/Manager/StatisticsController.php @@ -347,5 +347,3 @@ class StatisticsController extends CommonController return [$from_date, $to_date]; } } - - From 9d388990330d5c7342d2db11a3b8ab4d71afde79 Mon Sep 17 00:00:00 2001 From: weizong song Date: Thu, 11 Apr 2024 12:01:31 +0800 Subject: [PATCH 03/10] up --- app/Http/Controllers/Customer/OrdersController.php | 1 + config/logging.php | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/app/Http/Controllers/Customer/OrdersController.php b/app/Http/Controllers/Customer/OrdersController.php index 06fb6d6..0f7ad38 100644 --- a/app/Http/Controllers/Customer/OrdersController.php +++ b/app/Http/Controllers/Customer/OrdersController.php @@ -129,6 +129,7 @@ class OrdersController extends CommonController public function getAvailableParamedics(Request $request) { + Log::channel("daily_customer_order_request")->info($request->all()); $paramedics = (new Orders())->getAvailableParamedics(); return response()->json($paramedics); } diff --git a/config/logging.php b/config/logging.php index 9759d86..7259cad 100644 --- a/config/logging.php +++ b/config/logging.php @@ -53,6 +53,12 @@ return [ 'level' => 'debug', ], + 'daily_customer_order_request' => [ + 'driver' => 'daily', + 'path' => storage_path('logs/daily_customer_order_request.log'), + 'level' => 'debug', + ], + 'daily' => [ 'driver' => 'daily', 'path' => storage_path('logs/laravel.log'), From c5f6f6920688957aaf803bff3e942ba1fe80b6a8 Mon Sep 17 00:00:00 2001 From: weizong song Date: Thu, 11 Apr 2024 12:15:58 +0800 Subject: [PATCH 04/10] up --- app/Models/Orders.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Models/Orders.php b/app/Models/Orders.php index 05f6bd1..88bdf29 100755 --- a/app/Models/Orders.php +++ b/app/Models/Orders.php @@ -408,6 +408,7 @@ class Orders extends SoftDeletesModel $result = []; $result[$date] = $paramedics->toArray(); + dd(DB::getQueryLog()); return $result; } From b23c9e9b2719afb7c3f2d27946a880cae6b4485c Mon Sep 17 00:00:00 2001 From: weizong song Date: Thu, 11 Apr 2024 12:17:39 +0800 Subject: [PATCH 05/10] up --- app/Models/Orders.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/Orders.php b/app/Models/Orders.php index 88bdf29..5f5240d 100755 --- a/app/Models/Orders.php +++ b/app/Models/Orders.php @@ -399,6 +399,7 @@ class Orders extends SoftDeletesModel $product = (new Project())->find($bed->project_id)->products->first(); foreach ($paramedics as $paramedic) { $product_item = ProductItems::where("product_id", $product->id)->where("patient_quantity", "<=", $paramedic->ongoing_orders_count + 1)->orderBy("patient_quantity", "desc")->first(); + dump($product_item); $price = $paramedic->levelInProject->price??0 + $product_item->price??0; foreach ($factors as $factor) { $price += $factor["price"]??0; @@ -408,7 +409,6 @@ class Orders extends SoftDeletesModel $result = []; $result[$date] = $paramedics->toArray(); - dd(DB::getQueryLog()); return $result; } From a0c2035d002b2a5b0571bcb04a4e3b877107d34e Mon Sep 17 00:00:00 2001 From: weizong song Date: Thu, 11 Apr 2024 12:18:45 +0800 Subject: [PATCH 06/10] up --- app/Models/Orders.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/Orders.php b/app/Models/Orders.php index 5f5240d..c07ec4a 100755 --- a/app/Models/Orders.php +++ b/app/Models/Orders.php @@ -399,8 +399,8 @@ class Orders extends SoftDeletesModel $product = (new Project())->find($bed->project_id)->products->first(); foreach ($paramedics as $paramedic) { $product_item = ProductItems::where("product_id", $product->id)->where("patient_quantity", "<=", $paramedic->ongoing_orders_count + 1)->orderBy("patient_quantity", "desc")->first(); - dump($product_item); $price = $paramedic->levelInProject->price??0 + $product_item->price??0; + dump($price); foreach ($factors as $factor) { $price += $factor["price"]??0; } From c208bd422b5c5d56d74c59420447a42133d5f9c9 Mon Sep 17 00:00:00 2001 From: weizong song Date: Thu, 11 Apr 2024 12:19:13 +0800 Subject: [PATCH 07/10] up --- app/Models/Orders.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/Orders.php b/app/Models/Orders.php index c07ec4a..25d756e 100755 --- a/app/Models/Orders.php +++ b/app/Models/Orders.php @@ -400,7 +400,7 @@ class Orders extends SoftDeletesModel foreach ($paramedics as $paramedic) { $product_item = ProductItems::where("product_id", $product->id)->where("patient_quantity", "<=", $paramedic->ongoing_orders_count + 1)->orderBy("patient_quantity", "desc")->first(); $price = $paramedic->levelInProject->price??0 + $product_item->price??0; - dump($price); + dump($paramedic->levelInProject->price,$product_item->price); foreach ($factors as $factor) { $price += $factor["price"]??0; } From c35076d5994a7b06e7e007ef01616c0db631c346 Mon Sep 17 00:00:00 2001 From: weizong song Date: Thu, 11 Apr 2024 12:21:36 +0800 Subject: [PATCH 08/10] up --- app/Models/Orders.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/Models/Orders.php b/app/Models/Orders.php index 25d756e..66c5c6b 100755 --- a/app/Models/Orders.php +++ b/app/Models/Orders.php @@ -399,8 +399,11 @@ class Orders extends SoftDeletesModel $product = (new Project())->find($bed->project_id)->products->first(); foreach ($paramedics as $paramedic) { $product_item = ProductItems::where("product_id", $product->id)->where("patient_quantity", "<=", $paramedic->ongoing_orders_count + 1)->orderBy("patient_quantity", "desc")->first(); - $price = $paramedic->levelInProject->price??0 + $product_item->price??0; - dump($paramedic->levelInProject->price,$product_item->price); + $_product_item_price = $product_item->price ? $product_item->price : 0; + $_paramedic_price = $paramedic->levelInProject->price ? $paramedic->levelInProject->price : 0; + $price = $_product_item_price + $_paramedic_price; + + dump($price); foreach ($factors as $factor) { $price += $factor["price"]??0; } From 9fff659936f5019238e7fd4edcf35b5fbc7ac2df Mon Sep 17 00:00:00 2001 From: weizong song Date: Thu, 11 Apr 2024 12:22:25 +0800 Subject: [PATCH 09/10] up --- app/Models/Orders.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Models/Orders.php b/app/Models/Orders.php index 66c5c6b..8095c1b 100755 --- a/app/Models/Orders.php +++ b/app/Models/Orders.php @@ -403,9 +403,9 @@ class Orders extends SoftDeletesModel $_paramedic_price = $paramedic->levelInProject->price ? $paramedic->levelInProject->price : 0; $price = $_product_item_price + $_paramedic_price; - dump($price); foreach ($factors as $factor) { - $price += $factor["price"]??0; + $_factor_price = $factor["price"] ? $factor["price"] : 0; + $price += $_factor_price; } $paramedic->price = $price; } From 57ef075e980afdfc94fd45ab1edb6f0e85da1bc8 Mon Sep 17 00:00:00 2001 From: weizong song Date: Thu, 11 Apr 2024 12:22:39 +0800 Subject: [PATCH 10/10] up --- app/Http/Controllers/Customer/OrdersController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Customer/OrdersController.php b/app/Http/Controllers/Customer/OrdersController.php index 0f7ad38..00e7c95 100644 --- a/app/Http/Controllers/Customer/OrdersController.php +++ b/app/Http/Controllers/Customer/OrdersController.php @@ -129,7 +129,7 @@ class OrdersController extends CommonController public function getAvailableParamedics(Request $request) { - Log::channel("daily_customer_order_request")->info($request->all()); + //Log::channel("daily_customer_order_request")->info($request->all()); $paramedics = (new Orders())->getAvailableParamedics(); return response()->json($paramedics); }