fixed some tables and implemented getByUser in orderDAO
Merge