|
|
@@ -316,8 +316,8 @@ class WholeController extends Curd
|
|
|
->get()
|
|
|
->toArray();
|
|
|
|
|
|
- dump(00);
|
|
|
$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 == '自提') {
|
|
|
@@ -443,7 +443,6 @@ class WholeController extends Curd
|
|
|
$item['member']['level'] = MemberRole::where('member_role_id', $item['member']['join_member_role_id'])->value('member_role_name');
|
|
|
}
|
|
|
}
|
|
|
- dump(11);
|
|
|
$order->sheet_amount = number_format($sheetAmount, 2);
|
|
|
|
|
|
$payDetails = PayDetail::where('join_pay_order_id', $order->order_groupby)
|
|
|
@@ -460,7 +459,6 @@ class WholeController extends Curd
|
|
|
$order->cancel_times = $payExtendJson['cancel_times'] ?? '';
|
|
|
// $payDetail->cancel_times = $payExtendJson['cancel_times'] ?? '';
|
|
|
}
|
|
|
- dump(22);
|
|
|
if (!empty($payDetail) && !empty($payDetail->pay_prepayid)) {
|
|
|
$categoryArray = explode('-', $payDetail->pay_prepayid);
|
|
|
if (isset($categoryArray[1])) {
|
|
|
@@ -482,7 +480,6 @@ class WholeController extends Curd
|
|
|
|
|
|
$refund->order_return_refund_json = json_encode($returnRefundJson);
|
|
|
}
|
|
|
- dump(33);
|
|
|
if (!empty($order->order_config_json)) {
|
|
|
$orderConfigJson = json_decode($order->order_config_json, true);
|
|
|
if (isset($orderConfigJson['reach'])) {
|
|
|
@@ -511,7 +508,6 @@ class WholeController extends Curd
|
|
|
$order->cancel_times = $orderExtendJson['cancel_times'];
|
|
|
}
|
|
|
}
|
|
|
- dump(33);
|
|
|
$discount = ['coupon_name' => '', 'classify' => '', 'value' => 0];
|
|
|
if (!empty($order->order_discount_json)) {
|
|
|
$orderDiscountJson = json_decode($order->order_discount_json, true);
|
|
|
@@ -543,10 +539,7 @@ class WholeController extends Curd
|
|
|
if (!empty($discount['classify'])) {
|
|
|
$discount['classify'] = rtrim($discount['classify'], ', ');
|
|
|
}
|
|
|
- dump(44);
|
|
|
}
|
|
|
- dump(55);
|
|
|
- dump($discount);
|
|
|
$order->discount = $discount;
|
|
|
|
|
|
$order->premises = $order->premises ?? $premises;
|
|
|
@@ -558,8 +551,6 @@ class WholeController extends Curd
|
|
|
'payDetail' => json_decode(json_encode($payDetail)),
|
|
|
'payDetails' => json_decode(json_encode($payDetails))
|
|
|
];
|
|
|
- dump(66);
|
|
|
- dump($data);
|
|
|
|
|
|
return json_success('', $data);
|
|
|
|
gorden