From 553d503998ade301b66ab091d0d1a88f45da3cdb Mon Sep 17 00:00:00 2001 From: Hankin Date: Fri, 24 Apr 2026 09:49:40 +0800 Subject: [PATCH] transfer --- app/Http/Controllers/Server/H5/EarningController.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Server/H5/EarningController.php b/app/Http/Controllers/Server/H5/EarningController.php index 1dd0db5..06a3c3a 100644 --- a/app/Http/Controllers/Server/H5/EarningController.php +++ b/app/Http/Controllers/Server/H5/EarningController.php @@ -275,7 +275,7 @@ class EarningController extends Controller try { $merchant_id = $request->merchant_id ?? 0; $merchant_user_id = $request->merchant_user_id ?? 0; - $result = MEarningwithdraws::whereIn('status', ['finished', 'freezing'])->where('m_id', $merchant_id)->where('m_user_id', $merchant_user_id)->paginate(); + $result = MEarningwithdraws::whereIn('status', ['finished', 'freezing', "wait_user_confirm"])->where('m_id', $merchant_id)->where('m_user_id', $merchant_user_id)->paginate(); return $this->success('ok', $result); } catch (\Exception $e) { $this->getError($e); @@ -676,8 +676,13 @@ class EarningController extends Controller $token = $request->bearerToken(); $header = [ 'Authorization' => "Bearer " . $token, - 'Content-Type' => 'application/json' + 'Content-Type' => 'application/json', + 'wechatpay-timestamp' => $_SERVER['HTTP_WECHATPAY_TIMESTAMP'] ?? '', + 'wechatpay-nonce' => $_SERVER['HTTP_WECHATPAY_NONCE'] ?? '', + 'wechatpay-signature' => $_SERVER['HTTP_WECHATPAY_SIGNATURE'] ?? '', + 'wechatpay-serial' => $_SERVER['HTTP_WECHATPAY_SERIAL'] ?? '', ]; + $data = $request->all(); $options = [ RequestOptions::TIMEOUT => 3,