root 2 жил өмнө
parent
commit
909a511881

+ 24 - 0
app/Service/FyyOrderService.php

@@ -287,6 +287,18 @@ class FyyOrderService extends Service
                 ->groupBy('order_no')
                 ->groupBy('order_no')
                 ->orderBy('id','desc')
                 ->orderBy('id','desc')
                 ->get()->toArray();
                 ->get()->toArray();
+            $key_list = [];
+            foreach ($list as $v){
+                $customer_name = $v['customer_name'];
+                if(!isset($key_list[$customer_name])) $key_list[$customer_name] = [
+                    'customer_name' => $customer_name,
+                    'list' => [],
+                ];
+//                unset($v['customer_name']);
+                $key_list[$customer_name]['list'][] = $v;
+                sort($key_list);
+                $list = $key_list;
+            }
         }elseif($data['type'] == 2){
         }elseif($data['type'] == 2){
             $list = SaleOrdersProduct::where('del_time',0)
             $list = SaleOrdersProduct::where('del_time',0)
                 ->select('order_no','out_order_no','customer_name')
                 ->select('order_no','out_order_no','customer_name')
@@ -294,6 +306,18 @@ class FyyOrderService extends Service
                 ->groupBy('order_no')
                 ->groupBy('order_no')
                 ->orderBy('id','desc')
                 ->orderBy('id','desc')
                 ->get()->toArray();
                 ->get()->toArray();
+            $key_list = [];
+            foreach ($list as $v){
+                $customer_name = $v['customer_name'];
+                if(!isset($key_list[$customer_name])) $key_list[$customer_name] = [
+                    'customer_name' => $customer_name,
+                    'list' => [],
+                ];
+//                unset($v['customer_name']);
+                $key_list[$customer_name]['list'][] = $v;
+                sort($key_list);
+                $list = $key_list;
+            }
         }
         }
 
 
         return [true, $list];
         return [true, $list];