Merge branch 'main' of https://git.cjy.net.cn/zhangyan/hainan_2024

Laravel/app/Http/Controllers/TestController.php

@@ -16,8 +16,8 @@ class TestController extends Controller
 {
     public function DBtest(){
      echo  DB::table('users')->count();
-     // $order= new OrderService();
+      $order= new OrderService();
-    // dd($order->DepartmentItemCount(355));
+     dd($order->DepartmentItemCount(355));
       //退款------------------
 //      $data = [
 //        'orderid' => '20241108112106776eslNJ2',

Laravel/app/Services/OrderService.php

@@ -24,8 +24,6 @@ class OrderService
             $wait_day=$wait['Data']['预计所需天数'];
           } else {
             $wait_day=-1;
-          }
-
             //查询体检报告
             $data = [
               '电话号码' => "",
@@ -49,6 +47,9 @@ class OrderService
             }
           }
 
+
+        }
+
         $buy_info=json_decode($order->buy_info,true);
         $list=[];
         $drop_ids = ['519', '603'];