|
|
@ -232,7 +232,7 @@ class AccountController extends AbstractController
|
|
|
|
$userInfo = $this->checkUser($request);
|
|
|
|
$userInfo = $this->checkUser($request);
|
|
|
|
$userId = $this->resetUserId($userInfo['userId']);
|
|
|
|
$userId = $this->resetUserId($userInfo['userId']);
|
|
|
|
$query = Order::query()->with('user')->where('is_account_pay', 1);
|
|
|
|
$query = Order::query()->with('user')->where('is_account_pay', 1);
|
|
|
|
if ($userId != 'ACT_5') {
|
|
|
|
if ($userId != 'ACT_13') {
|
|
|
|
$query->where('user_id', $userId);
|
|
|
|
$query->where('user_id', $userId);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!empty($request->input('outOrderNo'))) {
|
|
|
|
if (!empty($request->input('outOrderNo'))) {
|
|
|
|