|
|
@@ -4520,14 +4520,13 @@ class WholeController extends Curd
|
|
|
if (strpos($print, '核销') !== false && $order->order_status_payment != 'SUCCESS') {
|
|
|
return json_fail('无法打印未支付的订单');
|
|
|
}
|
|
|
- dump($premises,$restaurant);
|
|
|
- if (!empty($premises) || $restaurant) {
|
|
|
+ if (!empty($premises) || !empty($restaurant)) {
|
|
|
if ($order->order_classify == 'DISHES' && empty($restaurant)) {
|
|
|
$restaurant = SysDept::where('dept_super_id', $premises->dept_id)->where('dept_category', '餐厅')->first();
|
|
|
} else {
|
|
|
$restaurant = $premises;
|
|
|
}
|
|
|
-
|
|
|
+ dump('餐厅',$restaurant->dept_extend_json);
|
|
|
if (!empty($restaurant->dept_extend_json)) {
|
|
|
$voteData = [
|
|
|
'func' => 'procActionToPrinter',
|
gorden