|
|
@@ -315,7 +315,6 @@ class WholeController extends Curd
|
|
|
->get()
|
|
|
->toArray();
|
|
|
|
|
|
- dump($orderSheet);
|
|
|
$order = Order::where('order_id', $orderId)->first();
|
|
|
$express = OrderExpress::where('join_express_order_id', $orderId)->first();
|
|
|
$premises = '';
|
|
|
@@ -442,7 +441,7 @@ class WholeController extends Curd
|
|
|
$item['member']['level'] = MemberRole::where('member_role_id', $item['member']['join_member_role_id'])->value('member_role_name');
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+ dump(1);
|
|
|
$order->sheet_amount = number_format($sheetAmount, 2);
|
|
|
|
|
|
$payDetails = PayDetail::where('join_pay_order_id', $order->order_groupby)
|
|
|
@@ -450,6 +449,7 @@ class WholeController extends Curd
|
|
|
->where('pay_status', 'SUCCESS')
|
|
|
->select('pay_id', 'pay_category', 'pay_prepayid', 'pay_paytimes', 'pay_status', 'pay_amount', 'pay_extend_json')
|
|
|
->get();
|
|
|
+ dump($payDetails);
|
|
|
if (count($payDetails) > 1) {
|
|
|
$order->pay_category = 'CONSTITUTE';
|
|
|
}
|
|
|
@@ -551,6 +551,7 @@ class WholeController extends Curd
|
|
|
'payDetail' => $payDetail,
|
|
|
'payDetails' => $payDetails
|
|
|
];
|
|
|
+ dump($data);
|
|
|
|
|
|
return json_success('', $data);
|
|
|
}
|
gorden