Commit 14ffdd95 authored by hujun's avatar hujun

Merge branch 'test'

parents bbc4053c 95ef2ab4
...@@ -71,7 +71,7 @@ class BrokerService ...@@ -71,7 +71,7 @@ class BrokerService
if ($item["is_forbidden"] == 0) { if ($item["is_forbidden"] == 0) {
return true; return true;
} elseif ($item["is_forbidden"] == 1) { //已存在申请关系 } elseif ($item["is_forbidden"] == 1) { //已存在申请关系
big_log('已存在申请关系:'.$device_id); // big_log('已存在申请关系:'.$device_id);
$is_exits = true; $is_exits = true;
} }
......
...@@ -77,6 +77,11 @@ class CallPhoneService ...@@ -77,6 +77,11 @@ class CallPhoneService
public function bindAXB($phone_a, $phone_b, $record = true, int $user_id, $agent_id, string $agent_name, int $landlord, int $house_id) public function bindAXB($phone_a, $phone_b, $record = true, int $user_id, $agent_id, string $agent_name, int $landlord, int $house_id)
{ {
$result['status'] = 'failed'; $result['status'] = 'failed';
//过年期间不能打电话
$result['msg'] = '过年期间不能打电话,具体等通知!';
return $result;
$type = ''; $type = '';
if (strlen($phone_a) != 11) { if (strlen($phone_a) != 11) {
$result['msg'] = '本机号码格式错误,请重新编辑!'; $result['msg'] = '本机号码格式错误,请重新编辑!';
......
...@@ -323,7 +323,7 @@ class Member extends Basic{ ...@@ -323,7 +323,7 @@ class Member extends Basic{
} }
} }
big_log(json_encode($where)); // big_log(json_encode($where));
$fields = 'a.id,a.user_nick,a.create_time,a.user_name,a.user_phone,a.user_pic,a.create_time,a.user_pswd,a.referrer_id,a.user_label, $fields = 'a.id,a.user_nick,a.create_time,a.user_name,a.user_phone,a.user_pic,a.create_time,a.user_pswd,a.referrer_id,a.user_label,
a.user_name,a.status,a.first_login_time,a.last_login_time,a.agent_id,a.vip,a.price_demand,a.industry_type,a.area_demand,a.user_status,a.source'; a.user_name,a.status,a.first_login_time,a.last_login_time,a.agent_id,a.vip,a.price_demand,a.industry_type,a.area_demand,a.user_status,a.source';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment