Compare commits

..

No commits in common. "ef841944b10d1e81c61c886e43f3bd073e6f1d41" and "09293d5af966670164b0848ce521f4d19e3e8f52" have entirely different histories.

2 changed files with 4 additions and 24 deletions

View File

@ -111,19 +111,9 @@ class PaymentNew
echo $responseBody;
}
return json_decode($responseBody);
return $responseBody;
} catch (\GuzzleHttp\Exception\RequestException $e) {
Log::warning("请求支付api失未知失败:" . $e->getMessage());
// 如果是 400 错误,可能有额外的请求错误信息
if ($e->hasResponse()) {
$response = $e->getResponse();
$httpCode = $response->getStatusCode();
if ($httpCode == 400) {
$responseBody = $response->getBody()->getContents();
Log::warning("请求支付api失败状态码 400响应体" . $responseBody);
}
}
return json_decode($responseBody);
}
}
/**
@ -162,7 +152,6 @@ class PaymentNew
}
} catch (\GuzzleHttp\Exception\RequestException $e) {
Log::warning("请求支付api失未知失败:" . $e->getMessage());
return -1;
}
}
}

View File

@ -104,11 +104,6 @@ class WithdrawController
//用户存了一个 转账信息 这里是用户转账信息的id
$bank_id = $request->post('bank_id');
$user_id = $request->data['id'];
$today = date('Y-m-d');
//判断用户今天提现几次
if (Withdraw::where('user_id', $user_id)->where('created_at', '>=', $today . " 00:00:00")->count() >= 3) {
return ApiResponseApp::error(null, '每天只能提现三次');
}
$user = User::find($user_id);
//提现金额
$rate = ExchangeRate::where('type', 'BDT')->get();
@ -133,20 +128,16 @@ class WithdrawController
//获取刚刚存入数据库的id(订单号)
$orderId = $withdraw->id;
$res = PaymentNew::pushMoney($money, $userbank->bank_username, $userbank->account, $userbank->bank_name, $orderId);
// //逻辑错误需要修改
if ($res->Success) {
if ($res['Success']) {
$withdraw->update([
'status' => 4, //
'status_text' => '等待银行打款',
'order_number' => $res->TrackingNumber ?? null,
'order_number' => $res['TrackingNumber'] ?? null,
]);
return ApiResponseApp::success(null, '转账成功');
} else {
if ($res->ErrorMessage == "PayeeAccountNumberFormatError") {
return ApiResponseApp::error(null, '收款人帐号格式错误');
}
return ApiResponseApp::error(null, '未知错误请联系客服');
return ApiResponseApp::error(null, '转账失败');
}
}