重塑order结构

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

@@ -150,7 +150,11 @@ class CommonController extends Controller
     {
         //$user = session('wechat.oauth_user.default');
         //$wechat_id = $user->getId();
+
         $wechat_id = $request->header("openid");
+        if(!$wechat_id) {
+            $wechat_id = $request->input("openid");
+        }
         if($wechat_id) {
             $os = array();
             $houseApplianceCleanOrder = HouseApplianceCleanOrder::where("wechat_id", $wechat_id)->get();
@@ -176,6 +180,7 @@ class CommonController extends Controller
                     $data["order_type"] = $order->order_type;
                     $data["photo"] = $order->photo;
                     $data["created_at"] = $order->created_at->toDateTimeString();
+                    $data["comment"] = false;
                     array_push($orders, $data);
                 }
             }
@@ -188,7 +193,8 @@ class CommonController extends Controller
                 $data["price"] = $order->price;
                 $data["order_type"] = $order->order_type;
                 $data["photo"] = $order->photo;
-                $data["created_at"] = $order->created_at->toDateTimeString();
+                $data["created_at"] = $order->created_at->toDateTimeString();;
+                $data["comment"] = false;
                 array_push($orders, $data);
             }
             return Response()->json([

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

@@ -28,6 +28,7 @@ class HouseApplianceCleanOrderController extends Controller
         $phone = $request->input('phone');
         $status = $request->input('status');
         $price = $request->input('price');
+        $photo = $request->input('photo');
         if ($id) {
             $houseApplianceCleanOrder = HouseApplianceCleanOrder::find($id);
             $houseApplianceCleanOrder->status = $status;
@@ -42,6 +43,7 @@ class HouseApplianceCleanOrderController extends Controller
             $houseApplianceCleanOrder->contact = $contact;
             $houseApplianceCleanOrder->phone = $phone;
             $houseApplianceCleanOrder->wechat_id = $wechat_id;
+            $houseApplianceCleanOrder->photo = $photo;
             $houseApplianceCleanOrder->save();
             return Response()->json([
                 "status" => 0,

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

@@ -34,6 +34,7 @@ class HouseCleanOrderController extends Controller
         $phone = $request->input('phone');
         $status = $request->input('status');
         $price = $request->input('price');
+        $photo = $request->input('photo');
         if ($id) {
             $houseCleanOrder = HouseCleanOrder::find($id);
             $houseCleanOrder->status = $status;
@@ -54,6 +55,7 @@ class HouseCleanOrderController extends Controller
             $houseCleanOrder->picture4 = $picture4;
             $houseCleanOrder->picture5 = $picture5;
             $houseCleanOrder->wechat_id = $wechat_id;
+            $houseCleanOrder->photo = $photo;
             $houseCleanOrder->save();
             return Response()->json([
                 "status" => 0,

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

@@ -32,6 +32,7 @@ class HousekeeperOrderController extends Controller
         $phone = $request->input('phone');
         $status = $request->input('status');
         $price = $request->input('price');
+        $photo = $request->input('photo');
         if ($id) {
             $housekeeperOrder = HousekeeperOrder::find($id);
             $housekeeperOrder->status = $status;
@@ -51,6 +52,7 @@ class HousekeeperOrderController extends Controller
             $housekeeperOrder->contact = $contact;
             $housekeeperOrder->phone = $phone;
             $housekeeperOrder->wechat_id = $wechat_id;
+            $housekeeperOrder->photo = $photo;
             $housekeeperOrder->save();
             return Response()->json([
                 "status" => 0,

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

@@ -31,6 +31,7 @@ class MaternityMatronOrderController extends Controller
         $phone = $request->input('phone');
         $status = $request->input('status');
         $price = $request->input('price');
+        $photo = $request->input('photo');
         if ($id) {
             $maternityMatronOrder = MaternityMatronOrder::find($id);
             $maternityMatronOrder->status = $status;
@@ -49,6 +50,7 @@ class MaternityMatronOrderController extends Controller
             $maternityMatronOrder->contact = $contact;
             $maternityMatronOrder->phone = $phone;
             $maternityMatronOrder->wechat_id = $wechat_id;
+            $maternityMatronOrder->photo = $photo;
             $maternityMatronOrder->save();
             return Response()->json([
                 "status" => 0,

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

@@ -32,6 +32,7 @@ class ProductOrderController extends Controller
         $contact = $request->input('contact');
         $phone = $request->input('phone');
         $status = $request->input('status');
+        $photo = $request->input('photo');
         if ($id) {
             $productOrder = ProductOrder::find($id);
             $productOrder->status = $status;
@@ -46,7 +47,6 @@ class ProductOrderController extends Controller
             $product = Product::find($product_id);
             $unit = $product->price;
             $product_name = $product->name;
-
             $productOrder->product_id = $product_id;
             $productOrder->product_name = $product_name;
             $productOrder->wechat_id = $wechat_id;
@@ -58,6 +58,7 @@ class ProductOrderController extends Controller
             $productOrder->address = $address;
             $productOrder->contact = $contact;
             $productOrder->phone = $phone;
+            $productOrder->photo = $photo;
             $productOrder->wechat_id = $wechat_id;
             $productOrder->save();
             return Response()->json([

manage-server/app/Models/HouseApplianceCleanOrder.php

@@ -2,28 +2,26 @@
 
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Model;
 
 /**
  * Class HouseApplianceCleanOrder
  * @package App\Models
  * 家电清洁
  */
-class HouseApplianceCleanOrder extends Model
+class HouseApplianceCleanOrder extends Order
 {
-    public $classify1 = "家政";
-    public $classify2 = "家电清洁";
-    public $order_type = "house_appliance_clean_order";
 
-    protected $fillable = [
-        'wechat_id', // 微信号id(open_id)
-		'appliances', // 项目, 数组形式，多个数量则出现多次
-    	'address', // 服务地址
-    	'contact', // 联系人
-    	'phone',	//联系电话
-    	'status', // 订单状态
-        'price', // 订单价格
-        'type', // 订单分类
-        'photo' // 显示的图片
-    ];
+    function __construct() {
+        parent::__construct("家政", "家电清洁", "house_appliance_clean_order");
+        $fillable = ['appliances'];// 项目, 数组形式，多个数量则出现多次
+        parent::mergeFillable(parent::getFillable(), $fillable);
+    }
+
+    /**
+     * 获取博客文章的评论
+     */
+    public function comments()
+    {
+        return $this->hasMany('App\Comment');
+    }
 }

manage-server/app/Models/HouseCleanOrder.php

@@ -2,33 +2,34 @@
 
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Model;
 
 /**
  * Class HouseCleanOrder
  * @package App\Models
  * 家居清洁订单
  */
-class HouseCleanOrder extends Model
+class HouseCleanOrder extends Order
 {
-    public $classify1 = "家政";
-    public $classify2 = "家居清洁";
-    public $order_type = "house_clean_order";
 
-    protected $fillable = [
-        'wechat_id', // 微信号id(open_id)
-		'type', // 清洁类型
-		'area', // 清洁面积
-    	'address', // 服务地址
-    	'contact', // 联系人
-    	'phone',	//联系电话
-		'picture1', // 图片1, 保持的是服务器上的图片地址
-		'picture2', // 图片2, 保持的是服务器上的图片地址
-		'picture3', // 图片3, 保持的是服务器上的图片地址
-		'picture4', // 图片4, 保持的是服务器上的图片地址
-		'picture5', // 图片5, 保持的是服务器上的图片地址
-    	'status', // 订单状态
-        'price', // 订单价格
-        'photo' // 显示的图片
-    ];
+    function __construct() {
+        parent::__construct("家政", "家居清洁", "house_clean_order");
+        $fillable = [
+            'type', // 清洁类型
+            'area', // 清洁面积
+            'picture1', // 图片1, 保持的是服务器上的图片地址
+            'picture2', // 图片2, 保持的是服务器上的图片地址
+            'picture3', // 图片3, 保持的是服务器上的图片地址
+            'picture4', // 图片4, 保持的是服务器上的图片地址
+            'picture5', // 图片5, 保持的是服务器上的图片地址
+        ];
+        parent::mergeFillable(parent::getFillable(), $fillable);
+    }
+
+    /**
+     * 获取博客文章的评论
+     */
+    public function comments()
+    {
+        return $this->hasMany('App\Comment');
+    }
 }

manage-server/app/Models/HousekeeperOrder.php

@@ -2,32 +2,32 @@
 
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Model;
 
 /**
  * Class HousekeeperOrder
  * @package App\Models
  * 保姆订单
  */
-class HousekeeperOrder extends Model
+class HousekeeperOrder extends Order
 {
 
-    public $classify1 = "家政";
-    public $classify2 = "保姆";
-    public $order_type = "housekeeper_order";
+    function __construct() {
+        parent::__construct("家政", "保姆", "housekeeper_order");
+        $fillable = [
+            'contents', // 服务内容, 数组形式，多个数量则出现多次
+            'people_num', //人口数量
+            'area', // 房屋面积
+            'server_time', // 服务时间: 全白天/住家
+            'rest', // 休息安排
+        ];
+        parent::mergeFillable(parent::getFillable(), $fillable);
+    }
 
-    protected $fillable = [
-        'wechat_id', // 微信号id(open_id)
-		'contents', // 服务内容, 数组形式，多个数量则出现多次
-    	'people_num', //人口数量
-        'area', // 房屋面积
-        'server_time', // 服务时间: 全白天/住家
-        'rest', // 休息安排
-        'address', // 服务地址
-    	'contact', // 联系人
-    	'phone',	//联系电话
-        'status', // 订单状态
-        'price', // 订单价格
-        'photo' // 显示的图片
-    ];
+    /**
+     * 获取博客文章的评论
+     */
+    public function comments()
+    {
+        return $this->hasMany('App\Comment');
+    }
 }

manage-server/app/Models/MaternityMatronOrder.php

@@ -2,31 +2,31 @@
 
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Model;
 
 /**
  * Class MaternityMatronOrder
  * @package App\Models
  * 月嫂订单
  */
-class MaternityMatronOrder extends Model
+class MaternityMatronOrder extends Order
 {
 
-    public $classify1 = "家政";
-    public $classify2 = "月嫂";
-    public $order_type = "maternity_matron_order";
+    function __construct() {
+        parent::__construct("家政", "月嫂", "maternity_matron_order");
+        $fillable = [
+            'level', // 月嫂等级
+            'expected_date', // 预产期
+            'server_time', // 服务时间
+            'special_demand', // 特殊需求
+        ];
+        parent::mergeFillable(parent::getFillable(), $fillable);
+    }
 
-    protected $fillable = [
-        'wechat_id', // 微信号id(open_id)
-        'level', // 月嫂等级
-        'expected_date', // 预产期
-        'server_time', // 服务时间
-        'special_demand', // 特殊需求
-        'address', // 服务地址
-        'contact', // 联系人
-        'phone',	//联系电话
-        'status', // 订单状态
-        'price', // 订单价格
-        'photo' // 显示的图片
-    ];
+    /**
+     * 获取博客文章的评论
+     */
+    public function comments()
+    {
+        return $this->hasMany('App\Comment');
+    }
 }

manage-server/app/Models/ProductOrder.php

@@ -2,34 +2,33 @@
 
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Model;
-
 /**
  * Class ProductOrder
  * @package App\Models
  * 产品订单
  */
-class ProductOrder extends Model
+class ProductOrder extends Order
 {
 
-    public $classify1 = "产品";
-    public $classify2 = "产品";
-    public $order_type = "product_order";
+    function __construct() {
+        parent::__construct("产品", "产品", "product_order");
+        $fillable = [
+            'product_id', // 产品名称
+            'product_name', // 产品信息
+            'color', // 产品颜色款色
+            'unit', // 产品单格
+            'amount', // 产品数量
+            'remark', // 买家备注
+            'info', // 卖家信息
+        ];
+        parent::mergeFillable(parent::getFillable(), $fillable);
+    }
 
-    protected $fillable = [
-        'wechat_id', // 微信号id(open_id)
-    	'product_id', // 产品名称
-		'product_name', // 产品信息
-        'color', // 产品颜色款色
-		'unit', // 产品单格
-		'amount', // 产品数量
-		'price', // 订单总价
-		'status', // 订单状态
-		'remark', // 买家备注
-		'info', // 卖家信息
-		'contact', // 买家联系人
-		'address', // 买家地址
-		'phone', // 买家手机号码,
-        'photo' // 显示的图片
-	];
+    /**
+     * 获取博客文章的评论
+     */
+    public function comments()
+    {
+        return $this->hasMany('App\Comment');
+    }
 }