gorden 5 mesi fa
parent
commit
b7af418913

+ 0 - 1
app/admin/controller/order/ServicesController.php

@@ -1962,7 +1962,6 @@ class ServicesController extends Curd
                         ]
                     ]
                 ];
-//                    dump("小票参数", $voteData);
                 http_post_json(getenv('VOTE_MENU_URL'), $voteData);
             }
         }

+ 9 - 9
app/admin/controller/order/WholeController.php

@@ -3897,13 +3897,6 @@ class WholeController extends Curd
 
         try {
             Db::beginTransaction();
-            $dept = [];
-            if (!empty($params['dept_premises_id'])) {
-                $dept = SysDept::where('dept_id', $params['dept_premises_id'])
-                    ->orWhere('dept_name', $params['dept_premises_id'])
-                    ->select('dept_id', 'dept_name', 'dept_status', 'dept_category', 'dept_super_id', 'dept_super_path')
-                    ->first();
-            }
             // 核销数据
             $params = [
                 'dept_premises_id' => $request->post('dept_premises_id'),
@@ -3914,6 +3907,14 @@ class WholeController extends Curd
             ];
             $writeOffData = OrderService::generateWriteOffData($params);
 
+            $dept = [];
+            if (!empty($params['dept_premises_id'])) {
+                $dept = SysDept::where('dept_id', $params['dept_premises_id'])
+                    ->orWhere('dept_name', $params['dept_premises_id'])
+                    ->select('dept_id', 'dept_name', 'dept_status', 'dept_category', 'dept_super_id', 'dept_super_path')
+                    ->first();
+            }
+
             // 开始减额度
             $benefitUsed = [];
             $appointmentIds = [];
@@ -4003,7 +4004,6 @@ class WholeController extends Curd
             _syslog("订单", "核销失败");
             return json_fail('核销失败');
         } finally {
-            dump($appointmentIds);
             if (!empty($appointmentIds)){
                 // 打印核销小票
                 foreach ($appointmentIds as $id) {
@@ -4587,12 +4587,12 @@ class WholeController extends Curd
                         ]
                     ]
                 ];
-                dump('打印的数据',$voteData);
                 http_post_json(getenv('VOTE_MENU_URL'), $voteData);
             }
 
             return json_success('success');
         } catch (\Exception $e) {
+            dump($e->getMessage());
             return json_fail('打印请求发送失败');
         }
     }