diff --git a/.gitignore b/.gitignore index ff712e7..6d02a28 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,5 @@ yarn-error.log .idea .vscode/launch.json -/storage/debugbar \ No newline at end of file +/storage/debugbar +/public/certs \ No newline at end of file diff --git a/app/Admin/Controllers/LanzuCsWithdrawController.php b/app/Admin/Controllers/LanzuCsWithdrawController.php index 3669a4e..558b5de 100644 --- a/app/Admin/Controllers/LanzuCsWithdrawController.php +++ b/app/Admin/Controllers/LanzuCsWithdrawController.php @@ -48,7 +48,7 @@ class LanzuCsWithdrawController extends AdminController $grid->column('csInfo.name', '提现用户'); $grid->money; $grid->status('状态')->using([1 => '已同意', -1 => '已拒绝', 0 => '待审核', -2 => '提现失败'])->label([1 => 'success', -1 => 'danger', 0 => 'default']); - $grid->is_pay('是否到账')->using(['否', '是']); + $grid->is_pay('是否到账')->using(['否', '是'])->label(['danger', 'success',]); $grid->created_at; $grid->filter(function (Grid\Filter $filter) { $filter->like('csInfo.name', '提现用户'); diff --git a/app/Admin/Controllers/Test.php b/app/Admin/Controllers/Test.php new file mode 100644 index 0000000..783542f --- /dev/null +++ b/app/Admin/Controllers/Test.php @@ -0,0 +1,37 @@ +transfer->toBalance([ + 'partner_trade_no' => $data['partner_trade_no'], // 商户订单号,需保持唯一性(只能是字母或者数字,不能包含有符号) + 'openid' => $data['openid'], + 'check_name' => 'NO_CHECK', // NO_CHECK:不校验真实姓名, FORCE_CHECK:强校验真实姓名 + 're_user_name' => $data['re_user_name'], // 如果 check_name 设置为FORCE_CHECK,则必填用户真实姓名 + 'amount' => $data['amount'], // 企业付款金额,单位为分 + 'desc' => $data['desc'], // 企业付款操作说明信息。必填 + ]); + return $res; + } +} diff --git a/app/Admin/routes.php b/app/Admin/routes.php index a6102e8..3853e3c 100644 --- a/app/Admin/routes.php +++ b/app/Admin/routes.php @@ -43,6 +43,5 @@ Route::group([ $router->any('/api/stores', 'LanzuServiceSpeakerController@getStores'); //统计店铺新增用户 $router->resource('/storeUserReport', 'StoreUserReportController'); - $router->any('/test', 'Test@test'); });