修复提现不显示 问题

This commit is contained in:
lingling 2025-02-18 12:36:42 +08:00
parent 8b8958d71e
commit be870ad1d7
3 changed files with 81 additions and 67 deletions

View File

@ -9,7 +9,7 @@ use GuzzleHttp\Client;
*/ */
class Payment class Payment
{ {
function generate_encrypt_value($data, $secret_key) { public static function generate_encrypt_value($data, $secret_key) {
// 1. 过滤掉 EncryptValue 和值为 null 的参数 // 1. 过滤掉 EncryptValue 和值为 null 的参数
$filtered_data = array_filter($data, function($v, $k) { $filtered_data = array_filter($data, function($v, $k) {
return $k !== "EncryptValue" && $v !== null; return $k !== "EncryptValue" && $v !== null;
@ -57,7 +57,7 @@ class Payment
"ShopUserLongId" => "776ae472-d4fc-435c-9639-be5763138d95" "ShopUserLongId" => "776ae472-d4fc-435c-9639-be5763138d95"
]; ];
$secret_key = "sZ2wAfh1lMkxBVrlY4uZY8Fj92E4scFf"; $secret_key = "sZ2wAfh1lMkxBVrlY4uZY8Fj92E4scFf";
$encrypt_value = Payment::generate_encrypt_value($payload, $secret_key); $encrypt_value = self::generate_encrypt_value($payload, $secret_key);
$payload["EncryptValue"] = $encrypt_value; $payload["EncryptValue"] = $encrypt_value;
$json_payload = json_encode($payload); $json_payload = json_encode($payload);

View File

@ -30,12 +30,13 @@ class WithdrawController
*/ */
public function withdrawCashList(Request $request) public function withdrawCashList(Request $request)
{ {
$page = $request->post('page'); $page = $request->post('page', 1); // 默认第一页
$size = $request->post('size'); $size = $request->post('size', 15); // 默认每页15条
$status = $request->post('status'); $status = $request->post('status', 0); // 默认状态为0全部
$time = $request->post('time'); $time = $request->post('time', null); // 默认时间不做过滤
$userId = $request->data['id']; $userId = $request->data['id'];
// 初始化查询构建器 // 初始化查询构建器
$query = Withdraw::query(); $query = Withdraw::query();
@ -56,7 +57,7 @@ class WithdrawController
$query->whereBetween('createtime2', [$todayStart, $todayEnd]); $query->whereBetween('createtime2', [$todayStart, $todayEnd]);
break; break;
case 2: case 2:
$query->whereBetween('createtime2', [$yesterdayStart, $todayStart]); $query->whereBetween('createtime2', [$yesterdayStart, $todayEnd]);
break; break;
case 3: case 3:
$query->whereBetween('createtime2', [$sevenDaysAgoStart, $todayEnd]); $query->whereBetween('createtime2', [$sevenDaysAgoStart, $todayEnd]);
@ -66,11 +67,25 @@ class WithdrawController
// 添加用户ID过滤条件 // 添加用户ID过滤条件
$query->where('user_id', $userId); $query->where('user_id', $userId);
$withdrawOrders = $query->orderBy('createtime2', 'desc')->get();
// 查询结果
$withdrawOrders = $query->orderBy('createtime2', 'desc')
->skip(($page - 1) * $size)
->take($size)
->get();
// 手动映射字段
$withdrawOrders = $withdrawOrders->map(function ($item) {
// 将 money 字段映射为 amount
$item->amount = $item->money;
unset($item->money); // 删除原始的 money 字段
return $item;
});
// 返回成功响应
return ApiResponseApp::success($withdrawOrders); return ApiResponseApp::success($withdrawOrders);
} }
/** /**
* @Apidoc\Title("小于1000直接转账大于1000生成审批") * @Apidoc\Title("小于1000直接转账大于1000生成审批")
* @Apidoc\Url("api/withdraw/submit") * @Apidoc\Url("api/withdraw/submit")
@ -104,6 +119,7 @@ class WithdrawController
$userbank = Userbank::where('user_id', $user_id)->first(); $userbank = Userbank::where('user_id', $user_id)->first();
$res = Payment::pushMoney($money, $userbank->bank_username, $userbank->account, $userbank->bank_name); $res = Payment::pushMoney($money, $userbank->bank_username, $userbank->account, $userbank->bank_name);
var_dump($res); var_dump($res);
//逻辑错误需要修改
if ($res['Success'] == 200) { if ($res['Success'] == 200) {
Withdraw::create([ Withdraw::create([
'user_id' => $user_id, 'user_id' => $user_id,
@ -166,6 +182,5 @@ class WithdrawController
UserRewardDao::base($user_id, 1, $money, '提现失败返还'); UserRewardDao::base($user_id, 1, $money, '提现失败返还');
return ApiResponseApp::error(null, '操作成功'); return ApiResponseApp::error(null, '操作成功');
} }
} }
} }

View File

@ -10,7 +10,7 @@ use app\model\GetLodeLog;
use app\model\User; use app\model\User;
/** /**
* 查询用户是否在线类 * 获取今天在线时间超过6小时的用户
*/ */
class Task3 class Task3
{ {
@ -48,7 +48,6 @@ class Task3
// }); // });
// // 每5秒执行一次 // // 每5秒执行一次
new Crontab('0 */5 * * * *', function () { new Crontab('0 */5 * * * *', function () {
echo date('Y-m-d H:i:s')."\n";
//获取今天在线时间超过6小时的用户 //获取今天在线时间超过6小时的用户
$today = date('Y-m-d'); $today = date('Y-m-d');
$UserPhone = UserPhone::where('time', '>=', 3600)::where('time', '<', 4200)::where('created_at','>=',$today)->get(); $UserPhone = UserPhone::where('time', '>=', 3600)::where('time', '<', 4200)::where('created_at','>=',$today)->get();