修复支付问题

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

@@ -158,11 +158,16 @@ class CommonController extends Controller
         }
         if($wechat_id) {
             $os = array();
-            $houseApplianceCleanOrder = HouseApplianceCleanOrder::where("wechat_id", $wechat_id)->get();
-            $houseCleanOrder = HouseCleanOrder::where("wechat_id", $wechat_id)->get();
-            $housekeeperOrder = HousekeeperOrder::where("wechat_id", $wechat_id)->get();
-            $maternityMatronOrder = MaternityMatronOrder::where("wechat_id", $wechat_id)->get();
-            $productOrder = ProductOrder::where("wechat_id", $wechat_id)->get();
+            $houseApplianceCleanOrder = HouseApplianceCleanOrder::where("wechat_id", $wechat_id)
+                ->orderBy('created_at', 'desc')->get();
+            $houseCleanOrder = HouseCleanOrder::where("wechat_id", $wechat_id)
+                ->orderBy('created_at', 'desc')->get();
+            $housekeeperOrder = HousekeeperOrder::where("wechat_id", $wechat_id)
+                ->orderBy('created_at', 'desc')->get();
+            $maternityMatronOrder = MaternityMatronOrder::where("wechat_id", $wechat_id)
+                ->orderBy('created_at', 'desc')->get();
+            $productOrder = ProductOrder::where("wechat_id", $wechat_id)
+                ->orderBy('created_at', 'desc')->get();
 
             array_push($os, $houseApplianceCleanOrder);
             array_push($os, $houseCleanOrder);
@@ -187,11 +192,11 @@ class CommonController extends Controller
                         $data["comment"] = false;
                     }
                     // 未支付订单3小时后过期
-                    if($order->status = 1) {
+                    /*if($order->status = 1) {
                         if(Carbon::now()->subHours(3)->gt($order->created_at)) {
                             continue;
                         }
-                    }
+                    }*/
                     array_push($orders, $data);
                 }
             }
@@ -211,11 +216,11 @@ class CommonController extends Controller
                     $data["comment"] = false;
                 }
                 // 未支付订单3小时后过期
-                if($order->status = 1) {
+                /*if($order->status = 1) {
                     if(Carbon::now()->subHours(3)->gt($order->created_at)) {
                         continue;
                     }
-                }
+                }*/
                 array_push($orders, $data);
             }
             return Response()->json([