From 55d7c0a090c28414012b2dfb7eebf260c4049326 Mon Sep 17 00:00:00 2001 From: yanzai Date: Mon, 9 Dec 2024 14:12:50 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Laravel/app/Http/Controllers/API/H5/OrderController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Laravel/app/Http/Controllers/API/H5/OrderController.php b/Laravel/app/Http/Controllers/API/H5/OrderController.php index 16b6e3a..d3826c9 100644 --- a/Laravel/app/Http/Controllers/API/H5/OrderController.php +++ b/Laravel/app/Http/Controllers/API/H5/OrderController.php @@ -424,6 +424,7 @@ class OrderController extends Controller 'wj_flag' => $wj_flag, 'youhuiquan' => $quanInfo === false ? '' : json_encode(['id' => $quanInfo['DZJID'], 'name' => $quanInfo['DZJLBMC']], JSON_UNESCAPED_UNICODE), 'created_at' => $now_datetime, + 'paycheck_time'=>$now_datetime ]; From 470cf26c9c6cb344fc1c725f0c4c0c907501f632 Mon Sep 17 00:00:00 2001 From: yanzai Date: Mon, 9 Dec 2024 14:21:20 +0800 Subject: [PATCH 2/8] 1 --- Laravel/routes/web.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Laravel/routes/web.php b/Laravel/routes/web.php index ac7f5b4..77d0c91 100644 --- a/Laravel/routes/web.php +++ b/Laravel/routes/web.php @@ -72,7 +72,6 @@ Route::group(['middleware' => ['log'],'prefix' => 'api/H5'], function () { Route::post('/HunQianQuestionSubmit', 'App\Http\Controllers\API\H5\QuestionController@HunQianQuestionSubmit');//婚前问卷提交 Route::post('/hunjianBySFZ', 'App\Http\Controllers\API\H5\UserController@hunjianBySFZ');//根据身份证查询建档信息 Route::post('/CheckedSignIn', 'App\Http\Controllers\API\H5\OrderController@CheckedSignIn');//检后签到 - Route::post('/RoundPayCheck', 'App\Http\Controllers\API\H5\OrderController@RoundPayCheck');//检后签到 @@ -100,3 +99,4 @@ Route::any('/PlanList', 'App\Http\Controllers\API\Internal\PlanController@PlanLi Route::any('/UsePlan', 'App\Http\Controllers\API\Internal\PlanController@UsePlan')->middleware('log');;//占用号源 Route::any('/CancelUsePlan', 'App\Http\Controllers\API\Internal\PlanController@CancelUsePlan')->middleware('log');;//取消占用号源 +Route::post('/RoundPayCheck', 'App\Http\Controllers\API\H5\OrderController@RoundPayCheck');//轮询支付检查 From e08947f9ac4ae061ba724d85e84d228c1fcfbd4d Mon Sep 17 00:00:00 2001 From: yanzai Date: Mon, 9 Dec 2024 14:59:07 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD=EF=BC=8C?= =?UTF-8?q?=E9=81=BF=E5=85=8D=E9=87=8D=E5=A4=8D=E9=A2=84=E7=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Http/Controllers/API/H5/OrderController.php | 14 ++++++++------ .../app/Http/Controllers/API/H5/PayController.php | 15 +++++++++------ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/Laravel/app/Http/Controllers/API/H5/OrderController.php b/Laravel/app/Http/Controllers/API/H5/OrderController.php index d3826c9..bacbc0c 100644 --- a/Laravel/app/Http/Controllers/API/H5/OrderController.php +++ b/Laravel/app/Http/Controllers/API/H5/OrderController.php @@ -1040,12 +1040,14 @@ class OrderController extends Controller //判断如果支付成功，更改订单状态 if ($res['data']['trade_state'] === 'SUCCESS') { $order = DB::table('orders')->where(['order_number' => $order_number])->first(); - DB::table('orders')->where(['id' => $order->id])->update([ - 'status' => 2, - 'pay_time' => date('Y-m-d H:i:s'), - ]); - $Finish = new OrderController();//预约体检 - $Finish->Finish($order_number); + if($order->status == 1){ + DB::table('orders')->where(['id' => $order->id])->update([ + 'status' => 2, + 'pay_time' => date('Y-m-d H:i:s'), + ]); + $Finish = new OrderController();//预约体检 + $Finish->Finish($order_number); + } return \Yz::Return(true, "支付成功", ['id' => $order->id]); } else { return \Yz::echoError1("未支付" . $res['data']['trade_state']); diff --git a/Laravel/app/Http/Controllers/API/H5/PayController.php b/Laravel/app/Http/Controllers/API/H5/PayController.php index 7686b36..71b73d7 100644 --- a/Laravel/app/Http/Controllers/API/H5/PayController.php +++ b/Laravel/app/Http/Controllers/API/H5/PayController.php @@ -87,12 +87,15 @@ class PayController extends Controller //判断如果支付成功，更改订单状态 if ($res['data']['trade_state'] === 'SUCCESS') { $order = DB::table('orders')->where(['order_number' => $order_number])->first(); - DB::table('orders')->where(['id' => $order->id])->update([ - 'status' => 2, - 'pay_time' => date('Y-m-d H:i:s'), - ]); - $Finish = new OrderController();//预约体检 - $Finish->Finish($order_number); + if($order->status == 1){ + DB::table('orders')->where(['id' => $order->id])->update([ + 'status' => 2, + 'pay_time' => date('Y-m-d H:i:s'), + ]); + $Finish = new OrderController();//预约体检 + $Finish->Finish($order_number); + } + return \Yz::Return(true, "支付成功", ['id' => $order->id]); } else { return \Yz::echoError1("支付失败" . $res['data']['trade_state']); From c1df50836fe05e9e7cdd71138f74d2119e5ba7df Mon Sep 17 00:00:00 2001 From: yanzai Date: Mon, 9 Dec 2024 15:17:38 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E8=BD=AE=E8=AF=A2?= =?UTF-8?q?=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Laravel/routes/web.php | 10 +++++----- bot/bot/bot_payCheck.php | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Laravel/routes/web.php b/Laravel/routes/web.php index 77d0c91..bd2ff16 100644 --- a/Laravel/routes/web.php +++ b/Laravel/routes/web.php @@ -94,9 +94,9 @@ Route::any('/TJPushInfo', 'App\Http\Controllers\API\Internal\SiXinPushController Route::any('/TJCheck', 'App\Http\Controllers\API\Internal\OrderController@TJCheck')->middleware('log');//到检 Route::any('/OrderBatchCancel', 'App\Http\Controllers\API\H5\OrderController@BatchCancel');//批量取消 -Route::any('/GetH5Order', 'App\Http\Controllers\API\Internal\OrderController@GetH5Order')->middleware('log');;//获取已经预约未到检订单 -Route::any('/PlanList', 'App\Http\Controllers\API\Internal\PlanController@PlanList')->middleware('log');;//获取可用号源列表 -Route::any('/UsePlan', 'App\Http\Controllers\API\Internal\PlanController@UsePlan')->middleware('log');;//占用号源 -Route::any('/CancelUsePlan', 'App\Http\Controllers\API\Internal\PlanController@CancelUsePlan')->middleware('log');;//取消占用号源 +Route::any('/GetH5Order', 'App\Http\Controllers\API\Internal\OrderController@GetH5Order')->middleware('log');//获取已经预约未到检订单 +Route::any('/PlanList', 'App\Http\Controllers\API\Internal\PlanController@PlanList')->middleware('log');//获取可用号源列表 +Route::any('/UsePlan', 'App\Http\Controllers\API\Internal\PlanController@UsePlan')->middleware('log');//占用号源 +Route::any('/CancelUsePlan', 'App\Http\Controllers\API\Internal\PlanController@CancelUsePlan')->middleware('log');//取消占用号源 -Route::post('/RoundPayCheck', 'App\Http\Controllers\API\H5\OrderController@RoundPayCheck');//轮询支付检查 +Route::post('/RoundPayCheck', 'App\Http\Controllers\API\H5\OrderController@RoundPayCheck')->middleware('log');//轮询支付检查 diff --git a/bot/bot/bot_payCheck.php b/bot/bot/bot_payCheck.php index 076d9f4..66111cd 100644 --- a/bot/bot/bot_payCheck.php +++ b/bot/bot/bot_payCheck.php @@ -9,7 +9,7 @@ $bot_loop->count = 1; $bot_loop->name = 'PayCheck'; function PayCheck($order_number) { - Tool::log('开始执行任务', 2); + Tool::log('开始执行PayCheck任务', 2); $url = Tool::ini('PAY_CHECK'); $res = Tool::post($url, [ 'order_number' => $order_number @@ -31,7 +31,7 @@ function PayCheckFunc() ]); PayCheck($pay_check['order_number']); } else { - Tool::log('未检测到任务'); + Tool::log('PayCheck未检测到任务'); } } From d23281bdd0930717713daa7497f5c46da3c22e64 Mon Sep 17 00:00:00 2001 From: yanzai Date: Mon, 9 Dec 2024 15:25:33 +0800 Subject: [PATCH 5/8] 1 --- Laravel/routes/web.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Laravel/routes/web.php b/Laravel/routes/web.php index bd2ff16..415fe36 100644 --- a/Laravel/routes/web.php +++ b/Laravel/routes/web.php @@ -99,4 +99,4 @@ Route::any('/PlanList', 'App\Http\Controllers\API\Internal\PlanController@PlanLi Route::any('/UsePlan', 'App\Http\Controllers\API\Internal\PlanController@UsePlan')->middleware('log');//占用号源 Route::any('/CancelUsePlan', 'App\Http\Controllers\API\Internal\PlanController@CancelUsePlan')->middleware('log');//取消占用号源 -Route::post('/RoundPayCheck', 'App\Http\Controllers\API\H5\OrderController@RoundPayCheck')->middleware('log');//轮询支付检查 +Route::post('/RoundPayCheck', 'App\Http\Controllers\API\H5\OrderController@RoundPayCheck');//轮询支付检查 From 50dce11943cc32036811db54807b0211b1a1e25e Mon Sep 17 00:00:00 2001 From: yanzai Date: Mon, 9 Dec 2024 15:43:27 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Laravel/app/Http/Controllers/API/H5/OrderController.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Laravel/app/Http/Controllers/API/H5/OrderController.php b/Laravel/app/Http/Controllers/API/H5/OrderController.php index bacbc0c..0228410 100644 --- a/Laravel/app/Http/Controllers/API/H5/OrderController.php +++ b/Laravel/app/Http/Controllers/API/H5/OrderController.php @@ -1047,8 +1047,11 @@ class OrderController extends Controller ]); $Finish = new OrderController();//预约体检 $Finish->Finish($order_number); + return \Yz::Return(true, "支付成功", ['id' => $order->id]); + }else{ + return \Yz::echoError1("状态非1无需执行。状态：".$order->status); } - return \Yz::Return(true, "支付成功", ['id' => $order->id]); + } else { return \Yz::echoError1("未支付" . $res['data']['trade_state']); } From 69806ca87dc6561b95d9a19ff6ca1b7e6830f374 Mon Sep 17 00:00:00 2001 From: yanzai Date: Tue, 10 Dec 2024 11:22:40 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=9B=A2=E6=A3=80+=E8=87=AA=E9=80=89?= =?UTF-8?q?=E6=8E=92=E9=99=A4=E7=9B=B8=E5=90=8C=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/Http/Controllers/API/H5/ComboController.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Laravel/app/Http/Controllers/API/H5/ComboController.php b/Laravel/app/Http/Controllers/API/H5/ComboController.php index efccb2d..8ad28da 100644 --- a/Laravel/app/Http/Controllers/API/H5/ComboController.php +++ b/Laravel/app/Http/Controllers/API/H5/ComboController.php @@ -362,10 +362,12 @@ select combo_id as c_id,count(*) as sale_count from orders where status in(2,4) } } $items_info = false;//自选项目信息 + $zixuan_item=[]; if (isset($item_ids) and !empty($item_ids)) { $item_price = 0; $items_original_price = 0; $items = DB::table('items')->whereIn('item_id', $item_ids)->where(['status' => 1])->get(); + $zixuan_item=$items; $groupedData = []; foreach ($items as $item) { //判断套餐项目和自选项目是否冲突 @@ -454,6 +456,17 @@ select combo_id as c_id,count(*) as sale_count from orders where status in(2,4) } } $group_info[0]['items'] =array_merge($group_info[0]['items'],$Nx1_arrInfo); //合并多选一 + + foreach ($zixuan_item as $item) { + //判断团检套餐项目和自选项目是否冲突 + if (isset( $group_info[0]['items'])) { + foreach ( $group_info[0]['items'] as $group_info_item) { + if ($group_info_item['id'] == $item->item_id) return \Yz::echoError1($item->name . "已经存在，不可重复选择"); + } + } + } + + // return \Yz::Return(true,"",$group_info[0]['items']); $all_items = DB::table('items')->where(['status' => 1])->get(); $item_new = []; From e1c869146c770d9f099418f8e7d3afdd8be99533 Mon Sep 17 00:00:00 2001 From: yanzai Date: Tue, 10 Dec 2024 21:18:21 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BA=8C=E7=BA=BF=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Http/Controllers/API/H5/OrderController.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Laravel/app/Http/Controllers/API/H5/OrderController.php b/Laravel/app/Http/Controllers/API/H5/OrderController.php index 0228410..2709207 100644 --- a/Laravel/app/Http/Controllers/API/H5/OrderController.php +++ b/Laravel/app/Http/Controllers/API/H5/OrderController.php @@ -335,7 +335,7 @@ class OrderController extends Controller $true_price = $true_price - ($jifen + $yucunkuan); if ($true_price < -1) return \Yz::echoError1("预抵扣金额超过订单金额，操作失败"); if ($true_price < 0) $true_price = 0; -//如果有二线号源,根据体检时间查询二线可用号源，区分上下午 +//如果有二线号源,根据体检时间查询二线可用号源，区分上下午，二线需预约体检时间1小时后 $plan_nmr_info=[]; if (isset($erxian_info) and !empty($erxian_info)) { foreach ($erxian_info as $erxian_item) { @@ -344,8 +344,11 @@ class OrderController extends Controller if($plan->time>"12:00") $end_time="23:59"; if(!isset($nmrPlans[$plan->date]) or empty($nmrPlans[$plan->date])) return \Yz::echoError1("二线号源不可用，请重新选则日期"); $temp_date=[]; + $planTime = new DateTime($plan->time); + $planTime->modify('+1 hour'); + $plan_time=$planTime->format('H:i'); foreach ($nmrPlans[$plan->date] as $nmp_p){ - if($nmp_p['Time']>=substr($plan->time,0,5) and $nmp_p['Time']<=$end_time and $nmp_p['keyong']==="0"){ + if($nmp_p['Time']>=$plan_time and $nmp_p['Time']<=$end_time and $nmp_p['keyong']==="0"){ $temp_date=[ "item_id"=>$erxian_item['item_id'], "name"=>$erxian_item['name'], @@ -585,7 +588,7 @@ class OrderController extends Controller $up_doctor=DB::table('orders')->where('id', $orderid)->update(['doctor' => $doctor]); return \Yz::Return(true,"操作完成",[]); } - //如果有二线号源,根据体检时间查询二线可用号源，区分上下午 + //如果有二线号源,根据体检时间查询二线可用号源，区分上下午，二线需预约体检时间1小时后 $db_nmr_info=json_decode($orderInfo->erxian_appointment_info,true); $nmr_info=[]; if (isset($db_nmr_info) and !empty($db_nmr_info)) { @@ -595,8 +598,11 @@ class OrderController extends Controller if($planInfo->time>"12:00") $end_time="23:59"; if(!isset($nmrPlans[$planInfo->date]) or empty($nmrPlans[$planInfo->date])) return \Yz::echoError1("二线号源不可用，请重新选则日期"); $temp_date=[]; + $planTime = new DateTime($planInfo->time); + $planTime->modify('+1 hour'); + $plan_time=$planTime->format('H:i'); foreach ($nmrPlans[$planInfo->date] as $nmp_p){ - if($nmp_p['Time']>=substr($planInfo->time,0,5) and $nmp_p['Time']<=$end_time and $nmp_p['keyong']==="0"){ + if($nmp_p['Time']>=$plan_time and $nmp_p['Time']<=$end_time and $nmp_p['keyong']==="0"){ $temp_date=[ "item_id"=>$erxian_item['item_id'], "name"=>$erxian_item['name'],