|
|
@@ -317,7 +317,6 @@ class WholeController extends Curd
|
|
|
->toArray();
|
|
|
|
|
|
$order = Order::where('order_id', $orderId)->first();
|
|
|
- dump($order);
|
|
|
$express = OrderExpress::where('join_express_order_id', $orderId)->first();
|
|
|
$premises = '';
|
|
|
if ($express && $express->order_express_type == '自提') {
|
|
|
@@ -543,8 +542,9 @@ class WholeController extends Curd
|
|
|
$order->discount = $discount;
|
|
|
|
|
|
$order->premises = $order->premises ?? $premises;
|
|
|
+ dump($order);
|
|
|
$data = [
|
|
|
- 'order' => json_decode(json_encode($order)),
|
|
|
+ 'order' => $order,
|
|
|
'refund' => json_decode(json_encode($refund)),
|
|
|
'sheet' => json_decode(json_encode($orderSheet)),
|
|
|
'express' => json_decode(json_encode($express)),
|
gorden