重塑order结构

manage-server/app/Http/Middleware/CheckToken.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+
+class CheckToken
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+
+        $wechat_id = $request->input("openid");
+        if(!$wechat_id) {
+            return Response()->json([
+                "status" => -1,
+                "error" => 403,
+                "message" => "openid不能为空，请先登陆"
+            ]);
+        }
+        return $next($request);
+    }
+}

manage-server/app/Models/HouseApplianceCleanOrder.php

@@ -18,7 +18,7 @@ class HouseApplianceCleanOrder extends Order
     }
 
     /**
-     * 获取博客文章的评论
+     * 获取评论
      */
     public function comments()
     {

manage-server/app/Models/HouseCleanOrder.php

@@ -26,7 +26,7 @@ class HouseCleanOrder extends Order
     }
 
     /**
-     * 获取博客文章的评论
+     * 获取评论
      */
     public function comments()
     {

manage-server/app/Models/HousekeeperOrder.php

@@ -24,7 +24,7 @@ class HousekeeperOrder extends Order
     }
 
     /**
-     * 获取博客文章的评论
+     * 获取评论
      */
     public function comments()
     {

manage-server/app/Models/MaternityMatronOrder.php

@@ -23,7 +23,7 @@ class MaternityMatronOrder extends Order
     }
 
     /**
-     * 获取博客文章的评论
+     * 获取评论
      */
     public function comments()
     {

manage-server/app/Models/Order.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Models;
+
+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;
+        $this->order_type = $order_type;
+    }
+
+    protected $fillable = [
+        'wechat_id', // 微信号id(open_id)
+        'address', // 服务地址
+        'contact', // 联系人
+        'phone',	//联系电话
+        'status', // 订单状态, 0.待处理 1.待支付 2.已支付
+        'price', // 订单价格
+        'photo', // 显示的图片
+        'comment_id', // 评论id
+    ];
+
+    public function setFillable($fillable) {
+        $this->fillable = $fillable;
+    }
+
+    public function getFillable() {
+        return $this->fillable;
+    }
+
+    public function mergeFillable($fillable) {
+        $this->fillable = array_merge($this->fillable, $fillable);
+    }
+}

manage-server/app/Models/ProductOrder.php

@@ -24,11 +24,4 @@ class ProductOrder extends Order
         parent::mergeFillable(parent::getFillable(), $fillable);
     }
 
-    /**
-     * 获取博客文章的评论
-     */
-    public function comments()
-    {
-        return $this->hasMany('App\Comment');
-    }
 }

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

@@ -46,6 +46,7 @@ class CreateProductOrdersTable extends Migration
             $table->string('address');
             $table->string('phone');
             $table->string('photo');
+            $table->unsignedInteger('comment_id');
         });
     }
 

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

@@ -39,6 +39,7 @@ class CreateMaternityMatronOrdersTable extends Migration
             $table->integer('status');
             $table->double('price');
             $table->string('photo');
+            $table->unsignedInteger('comment_id');
         });
     }
 

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

@@ -42,6 +42,7 @@ class CreateHousekeeperOrdersTable extends Migration
             $table->integer('status');
             $table->double('price');
             $table->string('photo');
+            $table->unsignedInteger('comment_id');
         });
     }
 

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

@@ -46,6 +46,7 @@ class CreateHouseCleanOrdersTable extends Migration
             $table->integer('status');
             $table->double('price');
             $table->string('photo');
+            $table->unsignedInteger('comment_id');
         });
     }
 

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

@@ -34,6 +34,7 @@ class CreateHouseApplicanceCleanOrdersTable extends Migration
             $table->integer('status');
             $table->double('price');
             $table->string('photo');
+            $table->unsignedInteger('comment_id');
         });
     }