diff --git a/app/controller/api/Vip_rewardController.php b/app/controller/api/Vip_rewardController.php index 7dbbbd0..027cb67 100644 --- a/app/controller/api/Vip_rewardController.php +++ b/app/controller/api/Vip_rewardController.php @@ -303,14 +303,12 @@ class Vip_rewardController } } $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.'等级奖励'); - }else{ - UserRewardDao::base($user_id, 6, $new_money, '首次VIP'.$vip_id.'等级奖励'); + // if ($UserReward->count() > 0) { + // UserRewardDao::base($user_id, 6, $money, 'VIP'.$vip_id.'等级奖励'); + // }else{ + // UserRewardDao::base($user_id, 6, $new_money, '首次VIP'.$vip_id.'等级奖励'); - } + // } return ApiResponseApp::success('领取成功'); } diff --git a/app/controller/api/Vip_salaryController.php b/app/controller/api/Vip_salaryController.php index 71ef20a..ac8d683 100644 --- a/app/controller/api/Vip_salaryController.php +++ b/app/controller/api/Vip_salaryController.php @@ -147,7 +147,7 @@ class Vip_salaryController break; } } - UserRewardDao::base($user_id, 6, $money, 'VIP'.$vip_id.'晋升奖励'); + // UserRewardDao::base($user_id, 6, $money, 'VIP'.$vip_id.'晋升奖励'); return ApiResponseApp::success('领取成功'); } } diff --git a/app/controller/api/WithdrawController.php b/app/controller/api/WithdrawController.php index e11bc52..e8c92d5 100644 --- a/app/controller/api/WithdrawController.php +++ b/app/controller/api/WithdrawController.php @@ -25,8 +25,14 @@ use support\Log; class WithdrawController { + /** + * 不需要token认证的方法 + */ protected $noNeedLogin = ['callback']; - + /** + * 手续费 + */ + protected static $handlingFee=0; /** * @Apidoc\Title("1.0 查询当前用户提现订单") * @Apidoc\Url("api/withdraw/withdrawCashList") @@ -126,12 +132,12 @@ class WithdrawController //大于1000等待管理员审核 if ($money_no >= 100000) { //用户积分减少$money - UserRewardDao::base($user_id, 1, - ($money_no + 300), '提现'); + UserRewardDao::base($user_id, 1, - ($money_no + self::$handlingFee), '提现'); return ApiResponseApp::success(null, '等待管理员审核'); } //用户积分减少$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(); //获取刚刚存入数据库的id(订单号) $orderId = $withdraw->id; @@ -174,7 +180,7 @@ class WithdrawController 'status' => 5, // 'status_text' => '支付错误:'.$errorMsg ]); - UserRewardDao::base($user_id, 1, $money_no + 300, '提现失败返还'); + UserRewardDao::base($user_id, 1, $money_no + self::$handlingFee, '提现失败返还'); // if ($res->ErrorMessage == "PayeeAccountNameFormatError") { // return ApiResponseApp::error(null, '收款人帐号格式错误'); // } diff --git a/app/dao/UserRewardDao.php b/app/dao/UserRewardDao.php index 9a80fd3..7a49c00 100644 --- a/app/dao/UserRewardDao.php +++ b/app/dao/UserRewardDao.php @@ -11,6 +11,10 @@ use app\model\User; */ class UserRewardDao { + /** + * 手续费 + */ + public static $handlingFee=0; /** * 注册赠送金额 */ diff --git a/public/js/index-77120936.js b/public/js/index-77120936.js index ce20a52..1d27943 100644 --- a/public/js/index-77120936.js +++ b/public/js/index-77120936.js @@ -506,7 +506,8 @@ const X = (e) => (w("data-v-a74356d2"), (e = e()), E(), e), "span", le, v(e.$t("提款手续费")) + - ":300 " + + ":0 " + + //孟加拉国提现手续费 v(e.$t("积分")), 1 ))