|
@@ -551,17 +551,17 @@ class WholeController extends Curd
|
|
|
|
|
|
$order->premises = $order->premises ?? $premises;
|
|
$order->premises = $order->premises ?? $premises;
|
|
$data = [
|
|
$data = [
|
|
- 'order' => $order,
|
|
|
|
- 'refund' => $refund,
|
|
|
|
- 'sheet' => $orderSheet,
|
|
|
|
- 'express' => $express,
|
|
|
|
- 'payDetail' => $payDetail,
|
|
|
|
- 'payDetails' => $payDetails
|
|
|
|
|
|
+ 'order' => json_decode(json_encode($order)),
|
|
|
|
+ 'refund' => json_decode(json_encode($refund)),
|
|
|
|
+ 'sheet' => json_decode(json_encode($orderSheet)),
|
|
|
|
+ 'express' => json_decode(json_encode($express)),
|
|
|
|
+ 'payDetail' => json_decode(json_encode($payDetail)),
|
|
|
|
+ 'payDetails' => json_decode(json_encode($payDetails))
|
|
];
|
|
];
|
|
dump(66);
|
|
dump(66);
|
|
dump($data);
|
|
dump($data);
|
|
|
|
|
|
- return json_success('', json_decode(json_encode($data)));
|
|
|
|
|
|
+ return json_success('', $data);
|
|
|
|
|
|
} catch (\Exception $e) {
|
|
} catch (\Exception $e) {
|
|
dump($e->getMessage());
|
|
dump($e->getMessage());
|