shulang/webman
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 注释掉VIP奖励和提现逻辑中的手续费，调整为0

Browse Source
This commit is contained in:
lingling 2025-02-28 22:59:38 +08:00
parent af6e5f870b
commit e9f83f685d
5 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/controller/api/Vip_rewardController.php
View File

@ -303,14 +303,12 @@ class Vip_rewardController
} }
} }
$UserReward = UserReward::where('memo', '首次VIP'.$vip_id.'等级奖励')->where('user_id', $user_id)->get(); $UserReward = UserReward::where('memo', '首次VIP'.$vip_id.'等级奖励')->where('user_id', $user_id)->get();
// if（） // if ($UserReward->count() > 0) {
//判断是否有 // UserRewardDao::base($user_id, 6, $money, 'VIP'.$vip_id.'等级奖励');
if ($UserReward->count() > 0) { // }else{
UserRewardDao::base($user_id, 6, $money, 'VIP'.$vip_id.'等级奖励'); // UserRewardDao::base($user_id, 6, $new_money, '首次VIP'.$vip_id.'等级奖励');
}else{
UserRewardDao::base($user_id, 6, $new_money, '首次VIP'.$vip_id.'等级奖励');
} // }
return ApiResponseApp::success('领取成功'); return ApiResponseApp::success('领取成功');
} }

2
app/controller/api/Vip_salaryController.php
View File

@ -147,7 +147,7 @@ class Vip_salaryController
break; break;
} }
} }
UserRewardDao::base($user_id, 6, $money, 'VIP'.$vip_id.'晋升奖励'); // UserRewardDao::base($user_id, 6, $money, 'VIP'.$vip_id.'晋升奖励');
return ApiResponseApp::success('领取成功'); return ApiResponseApp::success('领取成功');
} }
} }

14
app/controller/api/WithdrawController.php
View File

@ -25,8 +25,14 @@ use support\Log;
class WithdrawController class WithdrawController
{ {
/**
* 不需要token认证的方法
*/
protected $noNeedLogin = ['callback']; protected $noNeedLogin = ['callback'];
/**
* 手续费
*/
protected static $handlingFee=0;
/** /**
* @Apidoc\Title("1.0 查询当前用户提现订单") * @Apidoc\Title("1.0 查询当前用户提现订单")
* @Apidoc\Url("api/withdraw/withdrawCashList") * @Apidoc\Url("api/withdraw/withdrawCashList")
@ -126,12 +132,12 @@ class WithdrawController
//大于1000等待管理员审核 //大于1000等待管理员审核
if ($money_no >= 100000) { if ($money_no >= 100000) {
//用户积分减少$money //用户积分减少$money
UserRewardDao::base($user_id, 1, - ($money_no + 300), '提现'); UserRewardDao::base($user_id, 1, - ($money_no + self::$handlingFee), '提现');
return ApiResponseApp::success(null, '等待管理员审核'); return ApiResponseApp::success(null, '等待管理员审核');
} }
//用户积分减少$money //用户积分减少$money
UserRewardDao::base($user_id, 1, - ($money_no + 300), '提现'); UserRewardDao::base($user_id, 1, - ($money_no + self::$handlingFee), '提现');
$userbank = Userbank::where('id', $bank_id)->first(); $userbank = Userbank::where('id', $bank_id)->first();
//获取刚刚存入数据库的id(订单号) //获取刚刚存入数据库的id(订单号)
$orderId = $withdraw->id; $orderId = $withdraw->id;
@ -174,7 +180,7 @@ class WithdrawController
'status' => 5, // 'status' => 5, //
'status_text' => '支付错误：'.$errorMsg 'status_text' => '支付错误：'.$errorMsg
]); ]);
UserRewardDao::base($user_id, 1, $money_no + 300, '提现失败返还'); UserRewardDao::base($user_id, 1, $money_no + self::$handlingFee, '提现失败返还');
// if ($res->ErrorMessage == "PayeeAccountNameFormatError") { // if ($res->ErrorMessage == "PayeeAccountNameFormatError") {
// return ApiResponseApp::error(null, '收款人帐号格式错误'); // return ApiResponseApp::error(null, '收款人帐号格式错误');
// } // }

4
app/dao/UserRewardDao.php
View File

@ -11,6 +11,10 @@ use app\model\User;
*/ */
class UserRewardDao class UserRewardDao
{ {
/**
* 手续费
*/
public static $handlingFee=0;
/** /**
* 注册赠送金额 * 注册赠送金额
*/ */

3
public/js/index-77120936.js
View File

@ -506,7 +506,8 @@ const X = (e) => (w("data-v-a74356d2"), (e = e()), E(), e),
"span", "span",
le, le,
v(e.$t("提款手续费")) + v(e.$t("提款手续费")) +
"：300 " + "：0 " +
//孟加拉国提现手续费
v(e.$t("积分")), v(e.$t("积分")),
1 1
)) ))