up

app/Http/Controllers/Customer/AuthController.php

@@ -49,7 +49,7 @@ class AuthController extends Controller
     /**
      * @OA\Post(
      *     path="/customer/login",
-     *     summary="通过用户名和密码登录",
+     *     summary="V2-通过用户名和密码登录",
      *     description="预留接口，用户测试账号密码登录。实际场景使用code换取openid进行登录",
      *     @OA\Parameter(name="username", in="query", @OA\Schema(type="string"), required=true, description="用户名"),
      *     @OA\Parameter(name="password", in="query", @OA\Schema(type="string"), required=true, description="密码"),

app/Http/Controllers/Customer/OrdersController.php

@@ -26,12 +26,12 @@ class OrdersController extends CommonController
     /**
      * @OA\Get(
      *     path="/customer/get-projects",
-     *     summary="获取项目/医院列表",
-     *     description="获取项目/医院列表",
+     *     summary="V2-获取医院列表",
+     *     description="获取医院列表",
      *     @OA\Parameter(name="token", in="query", @OA\Schema(type="string"), required=true, description="token"),
      *     @OA\Response(
      *      response="200",
-     *      description="获取项目/医院列表",
+     *      description="获取医院列表",
 
      *     )
      * )
@@ -39,8 +39,7 @@ class OrdersController extends CommonController
 
     public function getProjects()
     {
-        //todo:排序，根据客户常用、距离等因素
-        $projects = (new Project())->with(["products", "defaultProduct", "managers"])->get();
+        $projects = Project::select("id","name","address")->get();
         return response()->json($projects->toArray());
     }
 
@@ -73,6 +72,28 @@ class OrdersController extends CommonController
         return response()->json($product->toArray());
     }
 
+    /**
+     * @OA\Get(
+     *     path="/customer/get-areas-by-project/{id}",
+     *     summary="V2-获取医院病区",
+     *     description="获取医院病区",
+     *     @OA\Parameter(name="token", in="query", @OA\Schema(type="string"), required=true, description="token"),
+     *     @OA\Parameter(name="id", in="path", @OA\Schema(type="integer"), required=true, description="project id"),
+     *     @OA\Response(
+     *      response="200",
+     *      description="获取医院床位"
+     *     )
+     * )
+     */
+
+    public function getAreasByProject($id)
+    {
+        $buildings = (new Building())->where("project_id", $id)->with(["areas" => function ($query) {
+            $query->select("id","building_id","name","myindex")->orderBy("myindex");
+        }])->select("id","name","myindex")->orderBy("myindex")->get();
+        return response()->json($buildings->toArray());
+    }
+
     /**
      * @OA\Get(
      *     path="/customer/get-beds-by-project/{id}",

app/Models/OrderItems.php

@@ -95,7 +95,7 @@ class OrderItems extends SoftDeletesModel
                         ->first();
                 }
 
-                $fee = $factor->fee_percent * $this->total / 100 + $factor->fee;
+                $fee = $factor->fee_percent * $this->total / 100 + $factor->fee - $this->fee_free;
                 $paramedic_total = $this->total - $fee;
                 $this->paramedic_total = $paramedic_total;
                 $this->fee = $fee;

composer.json

@@ -26,7 +26,7 @@
         "zircote/swagger-php": "^3.0"
     },
     "require-dev": {
-        "barryvdh/laravel-ide-helper": "^2.8",
+        "barryvdh/laravel-ide-helper": "^2.6",
         "facade/ignition": "^2.0",
         "fzaninotto/faker": "^1.9.1",
         "mockery/mockery": "^1.3.1",

routes/web.php

@@ -98,6 +98,7 @@ Route::group(["namespace" => "Customer", "prefix" => "customer"], function () {
     Route::group(['middleware' => ['authorize.jwt:customer']], function () {
         Route::get('get-projects', 'OrdersController@getProjects');
         Route::get('get-product/{id}', 'OrdersController@getProduct');
+        Route::get('get-areas-by-project/{id}', 'OrdersController@getAreasByProject');
         Route::get('get-beds-by-project/{id}', 'OrdersController@getBedsByProject');
         Route::get('get-orders', 'OrdersController@list');
         Route::get('get-order/{id}', 'OrdersController@getOrder');
@@ -157,3 +158,4 @@ Route::group(["namespace" => "Manager", "prefix" => "manager"], function () {
         Route::post('upload-image', 'OrdersController@uploadImage');
     });
 });
+