senyao
/
travel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

同步订单状态

This commit is contained in:
jianghanbo 2024-12-03 18:28:01 +08:00
parent 74e711a449
commit a7e664430b
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
service/app/admin/controller/AdminController.php
View File

@ -30,10 +30,13 @@ class AdminController extends base
//$routeType = self::ROUTE_LISTS[mb_substr($typeDesc, 0, 2)] ?? 10; //$routeType = self::ROUTE_LISTS[mb_substr($typeDesc, 0, 2)] ?? 10;
//$query->where('route_type', $routeType); //$query->where('route_type', $routeType);
} }
try {
if ($request->admin->is_franchisee == 1) { if ($request->admin->is_franchisee == 1) {
$query->where('pid', $request->admin->id); $query->where('pid', $request->admin->id);
} }
} catch (\Exception $exception) {
}
$list = $query->paginate($request->get('limit',10)); $list = $query->paginate($request->get('limit',10));
return $this->success($list->hidden(['password','remember_token']),null,['oss' => Orders::OSS]); return $this->success($list->hidden(['password','remember_token']),null,['oss' => Orders::OSS]);

5
service/app/admin/controller/OrderController.php
View File

@ -100,7 +100,7 @@ class OrderController extends base
$zhubo_id = Admins::where('username', $zhubo)->value('id'); $zhubo_id = Admins::where('username', $zhubo)->value('id');
$query->where('zhubo', $zhubo_id); $query->where('zhubo', $zhubo_id);
} }
try {
$admin = $request->get('admin'); $admin = $request->get('admin');
if ($request->admin->is_franchisee == 1) { if ($request->admin->is_franchisee == 1) {
$query->whereRaw(sprintf('admin_id in (select id from admins where pid = "%s")', $request->admin->id)); $query->whereRaw(sprintf('admin_id in (select id from admins where pid = "%s")', $request->admin->id));
@ -108,6 +108,9 @@ class OrderController extends base
$admin_id = Admins::where('username', $admin)->value('id'); $admin_id = Admins::where('username', $admin)->value('id');
$query->where('admin_id', $admin_id); $query->where('admin_id', $admin_id);
} }
} catch (\Exception $exception) {
}
$excel = $request->get('excel'); $excel = $request->get('excel');
if($excel == 1) { if($excel == 1) {