diff --git a/app/Http/Controllers/UserOrderController.php b/app/Http/Controllers/UserOrderController.php index f6e5ccd..a5d61de 100644 --- a/app/Http/Controllers/UserOrderController.php +++ b/app/Http/Controllers/UserOrderController.php @@ -235,7 +235,8 @@ class UserOrderController extends Controller $time = $request->post('time'); $time_info = Appointment::where('id', $time['id'])->where('status', 1)->where('del', 2)->first(); if (!$time_info) Yo::error_echo(200046); - if ($time_info->max_count <= $time_info->used_count) { + $order_count=DB::table('user_orders')->where('appointment',$time['id'])->whereIn('status',[2,4])->count(); + if ($time_info->max_count <= $order_count) { $time_info = false; } $check_items = []; @@ -304,7 +305,7 @@ class UserOrderController extends Controller $show = date('ymd') . str_pad(($order->id % 100000000), 8, "0", STR_PAD_LEFT); $order->show = $show; $order->save(); - $time_info->used_count += 1; + $time_info->used_count =$order_count+ 1; $time_info->save(); return Yo::create_echo($order->id); } @@ -529,7 +530,7 @@ class UserOrderController extends Controller "预约Id"=>$appointment_num , "预约开始时间"=>$user_info->danwei_time_start, "预约截止时间"=>$user_info->danwei_time_end, - "已排期"=>1, + "已排期"=>0, "排期操作时间"=>date("Y-m-d H:i:s"), "排期操作"=>"微信小程序" ]; diff --git a/北京仁仁体检小程序/api/api.js b/北京仁仁体检小程序/api/api.js index 5d105fe..95f97f7 100644 --- a/北京仁仁体检小程序/api/api.js +++ b/北京仁仁体检小程序/api/api.js @@ -1,7 +1,7 @@ let url_ = "https://bjrrtj-api.cjy.net.cn"; let report_url_ = "https://bjrrtj-api.cjy.net.cn"; let h5_url_ = "https://bjrrtj-api.cjy.net.cn"; -const dev = 0; +const dev = 1; if (dev === 1) { url_ = "http://localbeijingrenren"; report_url_ = "http://192.168.31.106:5173";