Merge branch 'master' of http://gitlab.bluearp.com/ldj/yhwx

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/Http/Controllers/WeChatApplet/Technician/WashWorkController.php

@@ -1322,8 +1322,7 @@ class WashWorkController extends Controller
             ];
             $log = addNewLog($user_info, $data);
             DB::commit();
-            return response()->json(['code'=>200, 'msg'=>'派单成功', 'data'=>'']);
-            // return $this->success('派单成功');
+            return $this->success('派单成功');
         } else {
             DB::rollBack();
             return $this->error('派单失败', ErrorInc::MYSQL_FAILED);

app/Services/Business/WashOrderService.php

@@ -756,11 +756,11 @@ class WashOrderService extends Service
         $wheres['ord_id_notin'] = $ord_ids;
         $wheres['ord_service_type_searchin'] = $search_data['ord_service_type'];
         $data['showcount'] = self::getStatusBar($wheres, $user_info);
-        if (empty($no_appoint_count)) {
-            $data['showcount'][3]['shownum'] = 0;
-        } else {
-            $data['showcount'][3]['shownum'] = $no_appoint_count->count;
-        }
+        // if (empty($no_appoint_count)) {
+        //     $data['showcount'][3]['shownum'] = 0;
+        // } else {
+        //     $data['showcount'][3]['shownum'] = $no_appoint_count->count;
+        // }
         return $data;
     }
 
@@ -4447,6 +4447,11 @@ class WashOrderService extends Service
                 ->where('dego_type','<>', 3)
                 ->value('dego_id');
         }
+        $find_order_cancel = DB::table('cancel_order_data')
+            ->where('ord_id', $request['ord_id'])
+            ->orderBy('id', 'desc')
+            ->get();
+        $data['find_order_cancel'] = $find_order_cancel?$find_order_cancel:[];
         $data['delivedry'] = DeliveryService::deliveryList($user_info,$dispatch_delivery)['data'];//快递信息
         return ['code'=>200, 'msg'=>'success', 'data'=>$data];
     }
@@ -11654,7 +11659,7 @@ class WashOrderService extends Service
             DB::table('cancel_order_data')
                 ->where('ord_id', $request['ord_id'])
                 ->where('state', 1)
-                ->update(['state'=>3]);
+                ->update(['state'=>3,'reject_remark'=>$request['remark']]);
         }
 
         return ['code'=>200, 'msg'=>'审核成功','data'=>''];

app/Services/Business/WashWorkService.php

@@ -3248,7 +3248,12 @@ class WashWorkService extends Service
         $info->ord_new_type_name = DB::table('order_type')
             ->where('orty_id', $info->ord_new_type)
             ->value('orty_name');
+        $find_order_cancel = DB::table('cancel_order_data')
+            ->where('ord_id', $info->wor_order_id)
+            ->orderBy('id', 'desc')
+            ->get();
         $data['work_data'] = $info;
+        $data['find_order_cancel'] = $find_order_cancel?$find_order_cancel:[];
         $data['goods_data'] = $goods_data;
         $data['technician_part'] = $technician_part;
         return ['code'=>200, 'msg'=>'success', 'data'=>$data];