Merge branch 'master' of /data/git/tiantian2

app/Http/Controllers/Manager/OrdersController.php

@@ -656,8 +656,8 @@ class OrdersController extends CommonController
                 event(new OrderAssigned($order));
             }
 
-            DB::commit();
             $order = (new AttachAffectedOrders)($order, $from_paramedic);
+            DB::commit();
             return response()->json($order->toArray());
         } catch (\Exception $exception) {
             DB::rollBack();