Merge remote-tracking branch 'origin/master'

app/Service/BookingListService.php

@@ -5,6 +5,7 @@ namespace App\Service;
 use App\Model\BookingList;
 use App\Model\BookingListInfo;
 use App\Model\Employee;
+use App\Model\OrderOperation;
 use App\Model\SalesOrder;
 use Illuminate\Support\Facades\DB;
 
@@ -79,6 +80,17 @@ class BookingListService extends Service
                 }
                 BookingListInfo::insert($insert);
             }
+
+            if($data['data_type'] == BookingList::data_type_one){
+                $order = SalesOrder::where('id',$data['data_id'])->first();
+                $order = $order->toArray();
+                (new OrderOperationService())->add([
+                    'order_number' => $order['order_number'],
+                    'msg' => OrderOperation::$type[OrderOperation::seven],
+                    'type' => OrderOperation::seven
+                ],$user);
+            }
+
             DB::commit();
         }catch (\Exception $exception){
             DB::rollBack();

app/Service/OrderOperationService.php

@@ -10,7 +10,7 @@ class OrderOperationService extends Service
         $model = new OrderOperation();
         $model->order_number = $data['order_number'];
         $model->msg = $data['msg'];
-        $model->user_id = $user['id'];
+        $model->user_id = $user['id'] ?? 0;
         $model->type = $data['type'];
         $model->save();
     }