From f23ea06711c28b9d4d119f7d3978c2b60751668f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=A5=E7=8C=AA=E7=8C=AA?= <377344020@qq.com> Date: Thu, 23 Dec 2021 11:56:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/AccountLogController.php | 0 .../admin/controller/ShopConfigController.php | 0 application/admin/controller/WithdrawController.php | 0 .../admin/view/account_log/integrallist.html | 0 application/admin/view/shop_config/shouyi.html | 0 application/admin/view/withdraw/lists.html | 0 application/api/controller/UserController.php | 13 ++++++++----- application/common/model/AccountLog.php | 0 application/common/model/ShopConfig.php | 0 application/common/model/WithdrawApply.php | 0 application/common/validate/AccountLogValidate.php | 0 application/common/validate/ShopConfigValidate.php | 0 .../common/validate/WithdrawApplyValidate.php | 0 13 files changed, 8 insertions(+), 5 deletions(-) mode change 100644 => 100755 application/admin/controller/AccountLogController.php mode change 100644 => 100755 application/admin/controller/ShopConfigController.php mode change 100644 => 100755 application/admin/controller/WithdrawController.php mode change 100644 => 100755 application/admin/view/account_log/integrallist.html mode change 100644 => 100755 application/admin/view/shop_config/shouyi.html mode change 100644 => 100755 application/admin/view/withdraw/lists.html mode change 100644 => 100755 application/common/model/AccountLog.php mode change 100644 => 100755 application/common/model/ShopConfig.php mode change 100644 => 100755 application/common/model/WithdrawApply.php mode change 100644 => 100755 application/common/validate/AccountLogValidate.php mode change 100644 => 100755 application/common/validate/ShopConfigValidate.php mode change 100644 => 100755 application/common/validate/WithdrawApplyValidate.php diff --git a/application/admin/controller/AccountLogController.php b/application/admin/controller/AccountLogController.php old mode 100644 new mode 100755 diff --git a/application/admin/controller/ShopConfigController.php b/application/admin/controller/ShopConfigController.php old mode 100644 new mode 100755 diff --git a/application/admin/controller/WithdrawController.php b/application/admin/controller/WithdrawController.php old mode 100644 new mode 100755 diff --git a/application/admin/view/account_log/integrallist.html b/application/admin/view/account_log/integrallist.html old mode 100644 new mode 100755 diff --git a/application/admin/view/shop_config/shouyi.html b/application/admin/view/shop_config/shouyi.html old mode 100644 new mode 100755 diff --git a/application/admin/view/withdraw/lists.html b/application/admin/view/withdraw/lists.html old mode 100644 new mode 100755 diff --git a/application/api/controller/UserController.php b/application/api/controller/UserController.php index 3facb97..2ba9b68 100755 --- a/application/api/controller/UserController.php +++ b/application/api/controller/UserController.php @@ -248,7 +248,7 @@ class UserController extends Controller } //用户中心 - public function userhome(Request $request,User $umodel,WithdrawAccount $wamodel) + public function userhome(Request $request,User $umodel,WithdrawAccount $wamodel,Order $omodel) { $param = $request->param(); $uid = $param['uid']?Crypt::decrypt($param['uid']):''; @@ -364,19 +364,22 @@ class UserController extends Controller if(!$account_info){ return client_error('请选择提现账户'); } + if(!$integral<=0){ + return client_error('请输入提现金额'); + } $umodel_info=$umodel->field('integral')->where(array('id'=>$uid))->find(); if($umodel_info['integral']<$integral){ - return client_error('积分不足，无法提现'); + return client_error('您的积分不足，无法提交申请'); } $min_withdraw =ShopConfig::get('withdraw', 'min_withdraw');//最低提现 $max_withdraw =ShopConfig::get('withdraw', 'max_withdraw');//最高提现积分 $poundage_type =ShopConfig::get('withdraw', 'poundage_type');//手续费类型 1固定 2比例 $poundage =ShopConfig::get('withdraw', 'poundage');//手续费 if($integral<$min_withdraw){ - return client_error('最少提现积分数'.$min_withdraw.'，无法提现'); + return client_error('提交提现申请失败，请联系客服咨询'); } if($integral>$max_withdraw){ - return client_error('最多提现积分数'.$max_withdraw.'，无法提现'); + return client_error('提交提现申请失败，请联系客服咨询'); } if($poundage_type==2){ $poundage=$integral*($poundage/100); @@ -421,7 +424,7 @@ class UserController extends Controller }catch(\Exception $e){ // 回滚事务 $waymodel->rollback(); - return client_error($e->getMessage()); + return client_error('提交提现申请失败，请联系客服咨询'); } return success('','提交提现申请成功，等待审核打款'); } diff --git a/application/common/model/AccountLog.php b/application/common/model/AccountLog.php old mode 100644 new mode 100755 diff --git a/application/common/model/ShopConfig.php b/application/common/model/ShopConfig.php old mode 100644 new mode 100755 diff --git a/application/common/model/WithdrawApply.php b/application/common/model/WithdrawApply.php old mode 100644 new mode 100755 diff --git a/application/common/validate/AccountLogValidate.php b/application/common/validate/AccountLogValidate.php old mode 100644 new mode 100755 diff --git a/application/common/validate/ShopConfigValidate.php b/application/common/validate/ShopConfigValidate.php old mode 100644 new mode 100755 diff --git a/application/common/validate/WithdrawApplyValidate.php b/application/common/validate/WithdrawApplyValidate.php old mode 100644 new mode 100755