审核啊取消修改0124

app/Http/Controllers/Mounting/Business/WashOrderController.php

@@ -2240,12 +2240,23 @@ class WashOrderController extends Controller
         if ($request['type'] == 1) {
             $data = DB::table('cancel_order_data')
                 ->where('ord_id', $request['ord_id'])
+                ->orderBy('id', 'desc')
                 ->first();
             return response()->json(['code'=>200, 'msg'=>'success', 'data'=>$data]);
         }
         DB::beginTransaction();
         $res = WashOrderService::auditCancel($user_info, $request);
         if ($res['code'] ==200) {
+            if($request['pass'] == 1) {
+                $state_name = '通过';
+            } else {
+                $state_name = '驳回';
+                if ($request['remark']) {
+                    $orre_res = orderRemark($user_info, $request['ord_id'], '', $request['remark'], '订单列表');
+                }
+            }
+            $orlo_res = orderLog($user_info, $request['ord_id'], '', '审核取消'.$state_name);
+            OperationLog::addLog($user_info, getRealIp($request), '订单列表', '审核取消', '审核取消' .$state_name. $request['ord_order_number'] . '成功');
             DB::commit();
         } else {
             DB::rollback();

app/Services/Business/WashOrderService.php

@@ -11641,10 +11641,10 @@ class WashOrderService extends Service
                 ->where('state', 1)
                 ->update(['state'=>2]);
         } else {
-            $wor_data['wor_state'] = 2; //11取消待审核
+            $wor_data['wor_state'] = 5; //11取消待审核
             $wor_data['wor_update_time'] = date('Y-m-d H:i:s');
             $wor_res = DB::table('work_order')
-                ->where('wor_id', $request['wor_id'])
+                ->where('wor_order_id', $request['ord_id'])
                 ->update($wor_data);
             $ord_data['ord_wor_state'] = 2; //订单的工单状态1未派工单2服务中4已完成7待接单11取消订单
             $ord_data['ord_update_time'] = $now_time;