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

Laravel/app/Http/Controllers/TestController.php

@@ -10,8 +10,8 @@ class TestController extends Controller
 {
     public function DBtest(){
      echo  DB::table('users')->count();
-     // $order= new OrderService();
+      //$order= new OrderService();
-    // $order->DepartmentItemCount(33);
+    // dd($order->DepartmentItemCount(33));
     }
 
     public function ApiTest(){

Laravel/app/Services/OrderService.php

@@ -61,8 +61,10 @@ class OrderService
       }
       $de_list=[];
       foreach ($groupedData as $key => $item) {
+
         $de_list[]=[
           'name'=>$key,
+          'keshi_id'=>$item[0]['keshi_id'],
           'count'=>count($item),
         ];
       }