ufutx/love_php
4
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

transfer

Browse Source
This commit is contained in:
Hankin 2026-04-24 09:49:40 +08:00
parent 81d3db72fe
commit 553d503998
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/Server/H5/EarningController.php
View File

@ -275,7 +275,7 @@ class EarningController extends Controller
try { try {
$merchant_id = $request->merchant_id ?? 0; $merchant_id = $request->merchant_id ?? 0;
$merchant_user_id = $request->merchant_user_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); return $this->success('ok', $result);
} catch (\Exception $e) { } catch (\Exception $e) {
$this->getError($e); $this->getError($e);
@ -676,8 +676,13 @@ class EarningController extends Controller
$token = $request->bearerToken(); $token = $request->bearerToken();
$header = [ $header = [
'Authorization' => "Bearer " . $token, '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(); $data = $request->all();
$options = [ $options = [
RequestOptions::TIMEOUT => 3, RequestOptions::TIMEOUT => 3,