diff --git a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php index 6f55485..0228493 100644 --- a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php +++ b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php @@ -20,13 +20,13 @@ class FenzhenController extends Controller // 这里放 弃检逻辑 $id = request('id'); $xmid = request('xmid'); - $orderInfo=DB::table('orders')->where('id',$id)->first(); - if(!$orderInfo) return \Yz::echoError1("订单不存在"); + $orderInfo = DB::table('orders')->where('id', $id)->first(); + if (!$orderInfo) return \Yz::echoError1("订单不存在"); $service = new ComboItemGroupService(); - $q=$service->QiJian($orderInfo->tj_number,$orderInfo->name,[$xmid]); - if($q['status']===true){ - return \Yz::Return(true, "弃检成功",[]); - }else{ + $q = $service->QiJian($orderInfo->tj_number, $orderInfo->name, [$xmid]); + if ($q['status'] === true) { + return \Yz::Return(true, "弃检成功", []); + } else { return \Yz::echoError1($q['msg']); } @@ -254,8 +254,8 @@ class FenzhenController extends Controller $res['data']['end_time'] = date('H:i', $last_time); $check_tip = false; if ($error_day == -1) { - $et = $info->appointment_date . strtotime($res['data']['end_time']); -// $et = '2024-10-10 00:00:00'; + $et = $info->appointment_date . strtotime($res['data']['end_time'] . ':00'); + // $et = '2024-10-10 00:00:00'; $check_tip = (time() - strtotime($et)) > (60 * 20); } return \Yz::Return(true, "获取成功", [ @@ -361,13 +361,13 @@ class FenzhenController extends Controller $beizhu = !!$item->beizhu ? $item->beizhu : ''; $tishi = !!$item->tishi ? $item->tishi : ''; $ret = []; - if(!!$canqian){ + if (!!$canqian) { $ret[] = $canqian; } - if(!!$beizhu){ + if (!!$beizhu) { $ret[] = $beizhu; } - if(!!$tishi){ + if (!!$tishi) { $ret[] = $tishi; } return count($ret) == 0 ? '' : '(' . implode(',', $ret) . ')';