Bladeren bron

添加企业介绍

chenxiqiang 6 jaren geleden
bovenliggende
commit
6224237683
1 gewijzigde bestanden met toevoegingen van 57 en 8 verwijderingen
  1. 57
    8
      manage-server/app/Http/Controllers/CommonController.php

+ 57
- 8
manage-server/app/Http/Controllers/CommonController.php Bestand weergeven

149
             $housekeeperOrder = HousekeeperOrder::where("wechat_id", $wechat_id)->get();
149
             $housekeeperOrder = HousekeeperOrder::where("wechat_id", $wechat_id)->get();
150
             $maternityMatronOrder = MaternityMatronOrder::where("wechat_id", $wechat_id)->get();
150
             $maternityMatronOrder = MaternityMatronOrder::where("wechat_id", $wechat_id)->get();
151
             $productOrder = ProductOrder::where("wechat_id", $wechat_id)->get();
151
             $productOrder = ProductOrder::where("wechat_id", $wechat_id)->get();
152
-            $orders = [];
152
+            $orders = array();
153
+            foreach ($houseApplianceCleanOrder as $order) {
154
+                $data = [];
155
+                $data["id"] = $order->id;
156
+                $data["classify1"] = $order->classify1;
157
+                $data["classify2"] = $order->classify2;
158
+                $data["status"] = $order->status;
159
+                $data["price"] = $order->price;
160
+                $data["created_at"] = $order->created_at;
161
+                array_push($orders, $data);
162
+            }
163
+
164
+            foreach ($houseCleanOrder as $order) {
165
+                $data = [];
166
+                $data["id"] = $order->id;
167
+                $data["classify1"] = $order->classify1;
168
+                $data["classify2"] = $order->classify2;
169
+                $data["status"] = $order->status;
170
+                $data["price"] = $order->price;
171
+                $data["created_at"] = $order->created_at;
172
+                array_push($orders, $data);
173
+            }
174
+
175
+            foreach ($housekeeperOrder as $order) {
176
+                $data = [];
177
+                $data["id"] = $order->id;
178
+                $data["classify1"] = $order->classify1;
179
+                $data["classify2"] = $order->classify2;
180
+                $data["status"] = $order->status;
181
+                $data["price"] = $order->price;
182
+                $data["created_at"] = $order->created_at;
183
+                array_push($orders, $data);
184
+            }
185
+
186
+            foreach ($maternityMatronOrder as $order) {
187
+                $data = [];
188
+                $data["id"] = $order->id;
189
+                $data["classify1"] = $order->classify1;
190
+                $data["classify2"] = $order->classify2;
191
+                $data["status"] = $order->status;
192
+                $data["price"] = $order->price;
193
+                $data["created_at"] = $order->created_at;
194
+                array_push($orders, $data);
195
+            }
196
+
197
+            foreach ($productOrder as $order) {
198
+                $data = [];
199
+                $data["id"] = $order->id;
200
+                $data["classify1"] = $order->classify1;
201
+                $data["classify2"] = $order->classify2;
202
+                $data["status"] = $order->status;
203
+                $data["price"] = $order->price;
204
+                $data["created_at"] = $order->created_at;
205
+                array_push($orders, $data);
206
+            }
207
+
153
 
208
 
154
             return Response()->json([
209
             return Response()->json([
155
                 "status" => 0,
210
                 "status" => 0,
156
-                "data" => [
157
-                    "houseApplianceCleanOrder" => $houseApplianceCleanOrder,
158
-                    "houseCleanOrder" => $houseCleanOrder,
159
-                    "housekeeperOrder" => $housekeeperOrder,
160
-                    "maternityMatronOrder" => $maternityMatronOrder,
161
-                    "productOrder" => $productOrder
162
-                ]
211
+                "data" => $orders
163
             ]);
212
             ]);
164
         }
213
         }
165
 
214
 

Loading…
Annuleren
Opslaan