区分订单类型

manage-server/app/Http/Controllers/HousekeeperOrderController.php

@@ -2,11 +2,20 @@
 
 namespace App\Http\Controllers;
 
+use App\Models\Classify;
 use Illuminate\Http\Request;
 use App\Models\HousekeeperOrder;
 
 class HousekeeperOrderController extends Controller
 {
+    public $classify_map = [];
+
+    public function __construct() {
+        $classifies = Classify::all();
+        foreach ($classifies as $classify) {
+            $this->classify_map[$classify->id] = $classify;
+        }
+    }
 
     /**
      * 创建保姆订单
@@ -33,13 +42,22 @@ class HousekeeperOrderController extends Controller
         $notes = $request->input('notes');
         $status = $request->input('status');
         $price = $request->input('price');
-        $type = $request->input('type');
         //$photo = $request->input('photo');
         if ($id) {
             $housekeeperOrder = HousekeeperOrder::find($id);
             $housekeeperOrder->status = $status;
             $housekeeperOrder->price = $price;
 
+            $classify = $request->input('classify');
+            if($classify) {
+                $classify1 = $this->classify_map[$classify]->name;
+                $pid = $this->classify_map[$classify]->pid;
+                $classify2 = $this->classify_map[$pid]->name;
+                $housekeeperOrder->classify1 = $classify1;
+                $housekeeperOrder->classify2 = $classify2;
+                $housekeeperOrder->classify = $classify;
+            }
+
         } else {
             $housekeeperOrder = new HousekeeperOrder;
             $housekeeperOrder->status = 0;
@@ -55,7 +73,7 @@ class HousekeeperOrderController extends Controller
             $housekeeperOrder->contact = $contact;
             $housekeeperOrder->notes = $notes;
             $housekeeperOrder->phone = $phone;
-            $housekeeperOrder->type = $type;
+            $housekeeperOrder->classify = $classify;
             $housekeeperOrder->wechat_id = $wechat_id;
             $housekeeperOrder->photo = "https://wechat.sotype.com/storage/gOtuHM3GvKva6x68N340DJuN6cX1oIfaAhWi8yoq.jpeg";
             $housekeeperOrder->save();
@@ -81,4 +99,8 @@ class HousekeeperOrderController extends Controller
     {
         return HousekeeperOrder::paginate(20);
     }
+
+    public function classify() {
+
+    }
 }

manage-server/app/Http/Controllers/MaternityMatronOrderController.php

@@ -37,6 +37,10 @@ class MaternityMatronOrderController extends Controller
             $maternityMatronOrder->status = $status;
             $maternityMatronOrder->price = $price;
 
+            $maternityMatronOrder->classify1 = "家政";
+            $maternityMatronOrder->classify2 = "月嫂";
+            $maternityMatronOrder->classify = 6;
+
         } else {
             $maternityMatronOrder = new MaternityMatronOrder;
             $maternityMatronOrder->status = 0;

manage-server/app/Models/HouseApplianceCleanOrder.php

@@ -12,7 +12,7 @@ class HouseApplianceCleanOrder extends Order
 {
 
     function __construct() {
-        parent::__construct("家政", "家电清洁", "house_appliance_clean_order");
+        parent::__construct( "house_appliance_clean_order");
         $fillable = ['appliances'];// 项目, 数组形式，多个数量则出现多次
         parent::mergeFillable(parent::getFillable(), $fillable);
     }

manage-server/app/Models/HouseCleanOrder.php

@@ -12,7 +12,7 @@ class HouseCleanOrder extends Order
 {
 
     function __construct() {
-        parent::__construct("家政", "家居清洁", "house_clean_order");
+        parent::__construct( "house_clean_order");
         $fillable = [
             'type', // 清洁类型
             'area', // 清洁面积

manage-server/app/Models/HousekeeperOrder.php

@@ -12,7 +12,7 @@ class HousekeeperOrder extends Order
 {
 
     function __construct() {
-        parent::__construct("家政", "保姆", "housekeeper_order");
+        parent::__construct("housekeeper_order");
         $fillable = [
             'contents', // 服务内容, 数组形式，多个数量则出现多次
             'people_num', //人口数量
@@ -20,7 +20,6 @@ class HousekeeperOrder extends Order
             'server_time', // 服务时间: 全白天/住家
             'rest', // 休息安排
             'notes', // 备注
-            'type', //订单类型
         ];
         parent::mergeFillable(parent::getFillable(), $fillable);
     }

manage-server/app/Models/MaternityMatronOrder.php

@@ -12,7 +12,7 @@ class MaternityMatronOrder extends Order
 {
 
     function __construct() {
-        parent::__construct("家政", "月嫂", "maternity_matron_order");
+        parent::__construct("maternity_matron_order");
         $fillable = [
             'level', // 月嫂等级
             'expected_date', // 预产期

manage-server/app/Models/Order.php

@@ -6,13 +6,9 @@ use Illuminate\Database\Eloquent\Model;
 
 class Order extends Model
 {
-    public $classify1 = "";
-    public $classify2 = "";
     public $order_type = "";
 
-    function __construct($classify1 = "", $classify2 = "", $order_type = "") {
-        $this->classify1 = $classify1;
-        $this->classify2 = $classify2;
+    function __construct($order_type = "") {
         $this->order_type = $order_type;
     }
 
@@ -25,7 +21,10 @@ class Order extends Model
         'price', // 订单价格
         'photo', // 显示的图片
         'comment_id', // 评论id
-        'paid_at',  // 支付时间
+        'paid_at',  // 支付时间,
+        'classify_id', //订单类型，分类
+        'classify1', //分类1
+        'classify2', //分类2
     ];
 
     public function setFillable($fillable) {

manage-server/database/migrations/2018_08_10_075128_create_maternity_matron_orders_table.php

@@ -42,6 +42,9 @@ class CreateMaternityMatronOrdersTable extends Migration
             $table->unsignedInteger('comment_id');
             $table->timestamps();
             $table->timestamp("paid_at");
+            $table->unsignedInteger('classify_id');
+            $table->string('classify1');
+            $table->string('classify2');
         });
     }
 

manage-server/database/migrations/2018_08_10_075742_create_housekeeper_orders_table.php

@@ -43,7 +43,9 @@ class CreateHousekeeperOrdersTable extends Migration
             $table->double('price');
             $table->string('photo');
             $table->string('notes');
-            $table->string('type');
+            $table->unsignedInteger('classify_id');
+            $table->string('classify1');
+            $table->string('classify2');
             $table->unsignedInteger('comment_id');
             $table->timestamp("paid_at");
         });

manage-server/database/migrations/2018_08_10_080158_create_house_clean_orders_table.php

@@ -48,6 +48,9 @@ class CreateHouseCleanOrdersTable extends Migration
             $table->string('photo');
             $table->unsignedInteger('comment_id');
             $table->timestamp("paid_at");
+            $table->unsignedInteger('classify_id');
+            $table->string('classify1');
+            $table->string('classify2');
         });
     }
 

manage-server/database/migrations/2018_08_10_080546_create_house_applicance_clean_orders_table.php

@@ -36,6 +36,9 @@ class CreateHouseApplicanceCleanOrdersTable extends Migration
             $table->string('photo');
             $table->unsignedInteger('comment_id');
             $table->timestamp("paid_at");
+            $table->unsignedInteger('classify_id');
+            $table->string('classify1');
+            $table->string('classify2');
         });
     }