|
@@ -205,36 +205,36 @@ class MemberPaymentService extends BaseService
|
|
|
$bankCard = isset($data['bank_card'])? $data['bank_card'] : '';
|
|
$bankCard = isset($data['bank_card'])? $data['bank_card'] : '';
|
|
|
if($type ==1){
|
|
if($type ==1){
|
|
|
if(empty($bankCard) || !preg_match('/^[1-9][0-9]{12,19}$/', $bankCard)){
|
|
if(empty($bankCard) || !preg_match('/^[1-9][0-9]{12,19}$/', $bankCard)){
|
|
|
- return returnJson('银行卡号格式不正确,请输入13-19位银行卡号');
|
|
|
|
|
|
|
+ return returnJson('银行卡号格式不正确,请输入13-19位银行卡号', false);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if($this->model->where(['bank_card'=> $bankCard])->whereNotIn('id', [$id])->value('id')){
|
|
if($this->model->where(['bank_card'=> $bankCard])->whereNotIn('id', [$id])->value('id')){
|
|
|
- return returnJson('您添加的银行卡号已存在,请核对正确或联系客服处理');
|
|
|
|
|
|
|
+ return returnJson('您添加的银行卡号已存在,请核对正确或联系客服处理', false);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if(empty($googleCode)){
|
|
if(empty($googleCode)){
|
|
|
- return returnJson('请输入您的谷歌验证码,或先绑定再来操作');
|
|
|
|
|
|
|
+ return returnJson('请输入您的谷歌验证码,或先绑定再来操作', false);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
$userInfo = \App\Services\Common\MemberService::make()->getInfo($userId);
|
|
$userInfo = \App\Services\Common\MemberService::make()->getInfo($userId);
|
|
|
if(empty($userInfo)){
|
|
if(empty($userInfo)){
|
|
|
- return returnJson('您的账号异常无法操作,请联系客服处理');
|
|
|
|
|
|
|
+ return returnJson('您的账号异常无法操作,请联系客服处理', false);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
$googleSecret = isset($info['google_secret'])? $info['google_secret'] : '';
|
|
$googleSecret = isset($info['google_secret'])? $info['google_secret'] : '';
|
|
|
if(empty($googleSecret)){
|
|
if(empty($googleSecret)){
|
|
|
- return returnJson(2017);
|
|
|
|
|
|
|
+ return returnJson(2017, false);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if (!GoogleAuthenticator::CheckCode($googleSecret, $googleCode)) {
|
|
if (!GoogleAuthenticator::CheckCode($googleSecret, $googleCode)) {
|
|
|
- return returnJson(2018);
|
|
|
|
|
|
|
+ return returnJson(2018, false);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
$limitCount = ConfigService::make()->getConfigByCode('payment_limit_num');
|
|
$limitCount = ConfigService::make()->getConfigByCode('payment_limit_num');
|
|
|
$limitCount = $limitCount>0? $limitCount : 30;
|
|
$limitCount = $limitCount>0? $limitCount : 30;
|
|
|
if($this->model->where(['user_id'=> $userId, 'mark'=> 1])->count('id') >= $limitCount){
|
|
if($this->model->where(['user_id'=> $userId, 'mark'=> 1])->count('id') >= $limitCount){
|
|
|
- return returnJson('您当前的收款账号数量已经超出限制,请删除无用账号或联系客服处理');
|
|
|
|
|
|
|
+ return returnJson('您当前的收款账号数量已经超出限制,请删除无用账号或联系客服处理', false);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// LOGO
|
|
// LOGO
|