From 23ebe87cafa1ceaf3ada7c33649f930370b17b18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E7=8B=BC?= <2468023037@qq.com> Date: Sun, 16 Feb 2025 22:44:10 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controller/api/WithdrawController.php | 4 ++-- config/database.php | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controller/api/WithdrawController.php b/app/controller/api/WithdrawController.php index 26f30ae..e79b015 100644 --- a/app/controller/api/WithdrawController.php +++ b/app/controller/api/WithdrawController.php @@ -85,7 +85,7 @@ class WithdrawController $user=User::find($user_id); //提现金额 $rate = ExchangeRate::where('type','BDT')->get(); - $money = $money_no/100*$rate[0]['points']; + $money = $money_no/100*$rate[0]['points']+500; //用户积分减少$money UserRewardDao::base($user_id, 1, -$money_no, '提现'); //大于1000等待管理员审核 @@ -158,7 +158,7 @@ class WithdrawController $userbank->save(); $rate = ExchangeRate::where('type','BDT')->get(); //计算积分 - $money = $amount*100/$rate[0]['points']; + $money = $amount*100/$rate[0]['points']+500; //用户id $user_id=$request->data['id']; //用户积分增加$money diff --git a/config/database.php b/config/database.php index e02edcc..d0ef7fa 100644 --- a/config/database.php +++ b/config/database.php @@ -33,10 +33,10 @@ return [ 'host' => '127.0.0.1', 'port' => '3306', 'database' => 'app_hd', - 'username' => 'app_hd', - 'password' => 'fmW4NwwXMxN8ShSM', - // 'username' => 'root', - // 'password' => '123456', + // 'username' => 'app_hd', + // 'password' => 'fmW4NwwXMxN8ShSM', + 'username' => 'root', + 'password' => '123456', 'charset' => 'utf8mb4', 'collation' => 'utf8mb4_general_ci', 'prefix' => '', From d36fddb1615bd595d1570c3cdb5d010630afc1f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E7=8B=BC?= <2468023037@qq.com> Date: Sun, 16 Feb 2025 22:45:27 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/database.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/database.php b/config/database.php index d0ef7fa..e02edcc 100644 --- a/config/database.php +++ b/config/database.php @@ -33,10 +33,10 @@ return [ 'host' => '127.0.0.1', 'port' => '3306', 'database' => 'app_hd', - // 'username' => 'app_hd', - // 'password' => 'fmW4NwwXMxN8ShSM', - 'username' => 'root', - 'password' => '123456', + 'username' => 'app_hd', + 'password' => 'fmW4NwwXMxN8ShSM', + // 'username' => 'root', + // 'password' => '123456', 'charset' => 'utf8mb4', 'collation' => 'utf8mb4_general_ci', 'prefix' => '', From 9aea9eb2944af6441ddd274493aad1e88e003646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E7=8B=BC?= <2468023037@qq.com> Date: Sun, 16 Feb 2025 22:54:13 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=E6=8F=90=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controller/api/WithdrawController.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controller/api/WithdrawController.php b/app/controller/api/WithdrawController.php index e79b015..1e5d304 100644 --- a/app/controller/api/WithdrawController.php +++ b/app/controller/api/WithdrawController.php @@ -85,9 +85,10 @@ class WithdrawController $user=User::find($user_id); //提现金额 $rate = ExchangeRate::where('type','BDT')->get(); - $money = $money_no/100*$rate[0]['points']+500; + $money = $money_no/100*$rate[0]['points']; + var_dump($money); //用户积分减少$money - UserRewardDao::base($user_id, 1, -$money_no, '提现'); + UserRewardDao::base($user_id, 1, -($money_no+500), '提现'); //大于1000等待管理员审核 if($money>=1000){ Withdraw::create([ From 919f29699e3e1c34ed5ed60eb667ea1c6f690686 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E7=8B=BC?= <2468023037@qq.com> Date: Mon, 17 Feb 2025 09:39:17 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=20=E9=A1=B5=E9=9D=A2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controller/api/CommonController.php | 21 +++++++++++++-------- app/controller/api/WithdrawController.php | 4 ++-- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/app/controller/api/CommonController.php b/app/controller/api/CommonController.php index 0ea437f..f87f68f 100644 --- a/app/controller/api/CommonController.php +++ b/app/controller/api/CommonController.php @@ -8,6 +8,7 @@ use App\Utils\ApiResponseApp; use App\model\Dictionary; +use App\model\ExchangeRate; use hg\apidoc\annotation as Apidoc; use support\Db; @@ -30,21 +31,25 @@ class CommonController $Dictionary=Dictionary::all(); $res=[]; + $ExchangeRate = ExchangeRate::all(); $res = [ "account_notice" => "Log in to link account and get 300 to 3,000 random points a day", - "vi_rate" => "2.49", - "trx_rate" => "0.00", - "nrly_rate" => "30", - "trx_rate1" => "", - "inr_rate" => "1.62", - "php_rate" => null, - "brl_rate" => "0.10", + // "vi_rate" => "2.49", + // "trx_rate" => "0.00", + // "nrly_rate" => "30", + // "trx_rate1" => "", + // "inr_rate" => "1.62", + // "php_rate" => null, + // "brl_rate" => "0.10", "brl_fee" => "300", "pkr_fee" => "300", - "pkr_rate" => "5", + // "pkr_rate" => "5", "pkr_min" => "2000", "brl_min" => "5000" ]; + foreach ($ExchangeRate as $item) { + $res[strtolower($item['type']) . '_rate'] = $item['points']; + } $col=['service_1','service_2','service_3','service_url','service_user_url','points']; foreach($Dictionary as $key=>$value){ $res[$value->key]=$value->value; diff --git a/app/controller/api/WithdrawController.php b/app/controller/api/WithdrawController.php index 1e5d304..0a99059 100644 --- a/app/controller/api/WithdrawController.php +++ b/app/controller/api/WithdrawController.php @@ -88,7 +88,7 @@ class WithdrawController $money = $money_no/100*$rate[0]['points']; var_dump($money); //用户积分减少$money - UserRewardDao::base($user_id, 1, -($money_no+500), '提现'); + UserRewardDao::base($user_id, 1, -($money_no+300), '提现'); //大于1000等待管理员审核 if($money>=1000){ Withdraw::create([ @@ -159,7 +159,7 @@ class WithdrawController $userbank->save(); $rate = ExchangeRate::where('type','BDT')->get(); //计算积分 - $money = $amount*100/$rate[0]['points']+500; + $money = $amount*100/$rate[0]['points']+300; //用户id $user_id=$request->data['id']; //用户积分增加$money