付款码轮训

app/admin/controller/order/WholeController.php

@@ -733,7 +733,7 @@ class WholeController extends Curd
         if (!empty($order->order_config_json)){
             $orderConfigJson = json_decode($order->order_config_json,true);
             if (isset($orderConfigJson['premises'])){
-                $premises = SysDept::where('dept_name',$orderConfigJson['premises'])->where('dept_category','营业场所')->first();
+                $premises = SysDept::where('dept_name',$orderConfigJson['premises'])->first();
             }
         }
         $params['orderId'] = $params['order_id'];
@@ -1116,7 +1116,8 @@ class WholeController extends Curd
             Db::commit();
             
             // 打小票
-            if (!empty($premises)){
+            if (!empty($premises) && $params['goods_classify'] == 'MEALS'){
+                dump("pay 打小票");
                 $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);
@@ -1193,7 +1194,7 @@ class WholeController extends Curd
         if (!empty($order->order_config_json)){
             $orderConfigJson = json_decode($order->order_config_json,true);
             if (isset($orderConfigJson['premises'])){
-                $premises = SysDept::where('dept_name',$orderConfigJson['premises'])->where('dept_category','营业场所')->first();
+                $premises = SysDept::where('dept_name',$orderConfigJson['premises'])->first();
             }
         }
         $params['orderId'] = $params['order_id'];
@@ -1404,7 +1405,8 @@ class WholeController extends Curd
             Db::commit();
             
             // 打小票
-            if (!empty($premises)){
+            if (!empty($premises) && $params['goods_classify'] == "MEALS"){
+                dump('payCons 打小票');
                 $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);
@@ -2025,7 +2027,8 @@ class WholeController extends Curd
             Db::commit();
 
             // 打小票
-            if (!empty($premises)){
+            if (!empty($premises) && isset($params['submit_goods_classify']) && $params['submit_goods_classify'] == 'MEALS'){
+                dump("insert 打小票");
                 if($premises->dept_category != '餐厅'){
                     $restaurant = SysDept::where('dept_super_id',$premises->dept_id)->where('dept_category','餐厅')->first();
                 }else{
@@ -2482,9 +2485,11 @@ class WholeController extends Curd
             }
 
             Db::commit();
-            
+
             // 打小票
-            if (!empty($premises)){
+            if (!empty($premises) && isset($params['submit_goods_classify']) && $params['submit_goods_classify'] == 'MEALS'){
+                dump("insertCons 打小票");
+//            if (!empty($premises)){
                 if($premises->dept_category != '餐厅'){
                     $restaurant = SysDept::where('dept_super_id',$premises->dept_id)->where('dept_category','餐厅')->first();
                 }else{