|
@@ -8,8 +8,10 @@ use app\controller\Curd;
|
|
|
use app\model\Goods;
|
|
|
use app\model\Order;
|
|
|
use app\model\OrderSheet;
|
|
|
+use app\model\SysDept;
|
|
|
use support\Request;
|
|
|
use support\Response;
|
|
|
+use Tinywan\Jwt\JwtToken;
|
|
|
|
|
|
class DishesController extends Curd
|
|
|
{
|
|
@@ -31,6 +33,8 @@ class DishesController extends Curd
|
|
|
*/
|
|
|
public function select(Request $request): Response
|
|
|
{
|
|
|
+ // 缓存的用户信息
|
|
|
+ $user = JwtToken::getExtend();
|
|
|
$timeType = $request->get('time_type', 'add');
|
|
|
[$where, $format, $limit, $field, $order] = $this->selectInput($request);
|
|
|
|
|
@@ -39,15 +43,19 @@ class DishesController extends Curd
|
|
|
$where['order_addtimes'][0] = strtotime($where['order_addtimes'][0]);
|
|
|
$where['order_addtimes'][1] = strtotime($where['order_addtimes'][1]);
|
|
|
}
|
|
|
+ // 场所
|
|
|
+ $premise = $request->get('premises');
|
|
|
+ if (!empty($user['join_user_dept_id']) && SysDept::where('dept_id', $user['join_user_dept_id'])->where('dept_category', '餐厅')->exists()) {
|
|
|
+ $where['json'] = ['order_config_json', 'dept', $user['join_user_dept_id']];
|
|
|
+ } else if (!empty($premise)) {
|
|
|
+ $where['json'] = ['order_config_json', 'dept', $premise];
|
|
|
+ }
|
|
|
|
|
|
if (!empty($where['order_status_system']) && $where['order_status_system'] == 'AWAITING') {
|
|
|
$where['order_status_system'] = 'PAYING';
|
|
|
$where['order_status_payment'] = 'AWAITING';
|
|
|
}
|
|
|
- $premise = $request->get('premises');
|
|
|
- if (!empty($premise)) {
|
|
|
- $where['json'] = ['order_config_json', 'dept', $premise];
|
|
|
- }
|
|
|
+
|
|
|
|
|
|
$order = $request->get('order', 'desc');
|
|
|
$orderId = $request->get('order_id', '');
|