|
@@ -2786,6 +2786,7 @@ class WholeController extends Curd
|
|
|
return json_fail('请选择打印设备');
|
|
|
}
|
|
|
$premises = SysDept::where('dept_name',$premiseName)->where('dept_category','营业场所')->where('dept_status','ACTIVED')->first();
|
|
|
+ $restaurant = SysDept::where('dept_name',$premiseName)->where('dept_category','餐厅')->where('dept_status','ACTIVED')->first();
|
|
|
$order = Order::where('order_id',$orderId)->first();
|
|
|
|
|
|
try {
|
|
@@ -2794,8 +2795,11 @@ class WholeController extends Curd
|
|
|
return json_fail('无法打印未支付的结账单');
|
|
|
}
|
|
|
|
|
|
- if (!empty($premises)){
|
|
|
- $restaurant = SysDept::where('dept_super_id',$premises->dept_id)->where('dept_category','餐厅')->first();
|
|
|
+ if (!empty($premises) || $restaurant){
|
|
|
+ if(empty($restaurant)){
|
|
|
+ $restaurant = SysDept::where('dept_super_id',$premises->dept_id)->where('dept_category','餐厅')->first();
|
|
|
+ }
|
|
|
+
|
|
|
if (!empty($restaurant->dept_extend_json)){
|
|
|
$deptExtendJson = json_decode($restaurant->dept_extend_json,true);
|
|
|
$voteData = [
|