Skip to content

T
tl_estate
Commit 85110be8 authored by zw's avatar zw
Browse files
Options

Merge branch 'test'

parents 796368e9 3c20ef7f
Hide whitespace changes
Inline Side-by-side
Showing with 168 additions and 46 deletions
application/api_broker/controller/CellPhone.php
View file @ 85110be8
......@@ -94,7 +94,7 @@ class CellPhone extends Basic
header('Access-Control-Allow-Origin:*');
$call = new CallPhoneService();
$result = $call->agentsUnBind($this->params['phone_a'], $this->params['phone_b'], $this->params['phone_x'], $this->params['user_id']);
$result = $call->agentsUnBindRedis($this->params['phone_a'], $this->params['phone_b'], $this->params['phone_x'], $this->params['user_id'], $this->agentId);
if ($result['status'] == 'success') {
$this->msg = $result['msg'];
......
application/api_broker/service/CallPhoneService.php
View file @ 85110be8
......@@ -122,18 +122,27 @@ class CallPhoneService
$result['phone'] = $phone_b;
return $result;
}
$call_key = 'call_'.$agent_id.'_'.$this->phone_a.'_'.$this->phone_b;
$phone_x = $this->redis->get($call_key);
$bind = new BindingPhone();
$where['a.status'] = 1;
$where['a.phone_a'] = $phone_a;
$where['a.phone_b'] = $phone_b;
$where['a.type'] = $this->is_privacy;
$phone_x = $bind->getPhoneX('b.phone_x', $where); //已经绑定的返回隐私号码
if (empty($phone_x)) {
$where['a.status'] = 1;
$where['a.phone_a'] = $phone_a;
$where['a.phone_b'] = $phone_b;
$where['a.type'] = $this->is_privacy;
$phone_x_arr = $bind->getPhoneX('b.phone_x,a.subsId', $where); //已经绑定的返回隐私号码
//兼容
$check_data = PlsDemo::querySubscriptionDetail($phone_x_arr['subsId'], $phone_x_arr['phone_x']);
if ($check_data->Code == 'OK') {
$phone_x = $phone_x_arr['phone_x'];
}
}
if (!empty($phone_x['phone_x'])) {
if (!empty($phone_x)) {
$result['status'] = 'success';
$result['phone'] = $phone_x['phone_x'];
$result['phone'] = $phone_x;
$result['msg'] = '已绑定，返回隐私号码。';
return $result; //绑定过了，返回隐号
}
......@@ -163,6 +172,7 @@ class CallPhoneService
$result['phone'] = $call_phone['phone'];
$result['msg'] = $call_phone['msg'];
$type = 'AliYunBindAxb';
$this->redis->set($call_key, $call_phone['phone'], strtotime($this->expiry_date));
$bind->recordBindPhone($call_phone['phone'], $phone_a, $phone_b, $record, $this->expiry_date, $this->subs_id, $this->request_id, $this->mapping_id, $this->is_privacy, $this->release);
} else {
$result['msg'] = $call_phone['msg'];
......@@ -175,7 +185,7 @@ class CallPhoneService
$result['phone'] = $call_phone['phone'];
$result['msg'] = $call_phone['msg'];
$type = 'YunTongXunBindAxb';
$this->redis->set($call_key, $call_phone['phone'], strtotime($this->expiry_date));
$bind->recordBindPhone($call_phone['phone'], $phone_a, $phone_b, $record, $this->expiry_date, $this->subs_id, $this->request_id, $this->mapping_id, $this->is_privacy, $this->release);
} else {
$result['msg'] = $call_phone['msg'];
......@@ -287,6 +297,98 @@ class CallPhoneService
return $data;
}
/**
* 解除(redis)中绑定关系
*
* @param $phone_a
* @param $phone_b
* @param $phone_x
* @param $user_id
* @param $agent_id
* @return mixed
*/
public function agentsUnBindRedis($phone_a, $phone_b, $phone_x, $user_id, $agent_id)
{
$data['status'] = 'success';
$data['msg'] = '';
if (empty($phone_x)) {
$data['status'] = 'failed';
$data['msg'] = '解除失败，请联系运营人员！';
return $data;
}
if (empty($phone_a)) {
$data['status'] = 'failed';
$data['msg'] = '解除失败，请联系运营人员！';
return $data;
}
$this->phone_a = $phone_a;
$this->phone_x = $phone_x;
if (empty($phone_b)) {
if (!empty($user_id)) {
$this->user_id = $user_id;
$user_data = $this->getUserData();
if (empty($user_data['user_phone'])) {
$data['status'] = 'failed';
$data['msg'] = '没有客户信息，可以忽略。';
return $data;
}
$this->phone_b = $user_data['user_phone'];
}
} else {
$this->phone_b = $phone_b;
}
if (empty($this->phone_b)) {
$data['status'] = 'failed';
$data['msg'] = '解除失败，请联系运营人员！';
return $data;
}
$phone = new BindingPhone();
$call_key = 'call_'.$agent_id.'_'.$this->phone_a.'_'.$this->phone_b;
try {
if ($this->is_privacy == 1) {
/*阿里云*/
$subsId = $phone->getSubsId($this->phone_x, $this->phone_a, $this->phone_b, 1, 'subsId');
if ($subsId) {
$result = PlsDemo::unbindSubscription($subsId, $this->phone_x);/*解绑*/
if ($result->Message == 'OK') {
$this->redis->del($call_key);
} else {
$data['status'] = 'failed';
$data['msg'] = '解除失败，如果需要继续与客户沟通，请联系运营！';
}
} else {
$data['msg'] = '没有号码绑定关系，请忽略！';
}
} elseif ($this->is_privacy == 2) {
/*容联云*/
$mappingId = $phone->getSubsId($this->phone_x, $this->phone_a, $this->phone_b, 1, 'mappingId');
$yun_tong_xun = new RongDemo();
if ($mappingId) {
$result = $yun_tong_xun->releaseNumber($mappingId);/*解绑*/
if ($result['statusCode'] == '000000') {
$this->redis->del($call_key);
}
} else {
$data['msg'] = '没有号码绑定关系，请忽略！。';
}
} else {
$data['msg'] = '没有号码绑定关系，请忽略！。';
}
} catch (\Exception $e) {
$data['status'] = 'failed';
$data['msg'] = $e->getMessage();
}
return $data;
}
/**
* @return mixed|\SimpleXMLElement
*/
......
application/app/view/index/share_detail.html
View file @ 85110be8
......@@ -84,21 +84,6 @@
<span class="b3_span2 gw"></span>
</p>
<p class="line_hr"></p>
<!--设施配套-->
<div class="b4_font">
<p class="b4_font_p">
配套设施
</p>
<ul class="b4_font2 supporting-facilities">
<li><span class="icon-bg-facilities"><img src="/app/images/icon_200w@2x.png" class="supporting-facilities-img"/></span><span class="electric-quantity-details">200W</span></li>
<li><span class="icon-bg-facilities"><img src="/app/images/icon380v@2x.png" class="supporting-facilities-img"/></span><span class="voltage-details">380V</span></li>
<li class="meiqi-details-li"><span class="icon-bg-facilities"><img src="/app/images/icon_gas@2x.png" class="supporting-facilities-img"/></span><span class="meiqi">燃气</span></li>
<li class="exhaust-fume-details-li"><span class="icon-bg-facilities"><img src="/app/images/icon_piping@2x.png" class="supporting-facilities-img"/></span><span class="exhaust-fume-details">烟管道</span></li>
<li class="running-water-details-li"><span class="icon-bg-facilities"><img src="/app/images/icon_upper@2x.png" class="supporting-facilities-img"/></span><span class="running-water-details">上水</span></li>
<li class="downriver-details-li"><span class="icon-bg-facilities"><img src="/app/images/icon_sewer@2x.png" class="supporting-facilities-img"/></span><span class="downriver-details">下水</span></li>
</ul>
</div>
<p class="line_hr"></p>
<!--line 6-->
<div class="b4_font">
<p class="b4_font_p">
......@@ -171,6 +156,24 @@
<p class="b4_font_p_evaluation b4_font2">
其他补充：<span class="b4_font_evaluation other-supplementary">有证照，省去开店前置手续。有380V动力电，满足设备用电需要。</span>
</p>
</div>
<p class="line_hr"></p>
<!--设施配套-->
<div class="b4_font">
<p class="b4_font_p">
配套设施
</p>
<ul class="b4_font2 supporting-facilities">
<li><span class="icon-bg-facilities"><img src="/app/images/icon_200w@2x.png" class="supporting-facilities-img"/></span><span class="electric-quantity-details">200W</span></li>
<li><span class="icon-bg-facilities"><img src="/app/images/icon380v@2x.png" class="supporting-facilities-img"/></span><span class="voltage-details">380V</span></li>
<li class="meiqi-details-li"><span class="icon-bg-facilities"><img src="/app/images/icon_gas@2x.png" class="supporting-facilities-img"/></span><span class="meiqi">燃气</span></li>
<li class="exhaust-fume-details-li"><span class="icon-bg-facilities"><img src="/app/images/icon_piping@2x.png" class="supporting-facilities-img"/></span><span class="exhaust-fume-details">烟管道</span></li>
<li class="running-water-details-li"><span class="icon-bg-facilities"><img src="/app/images/icon_upper@2x.png" class="supporting-facilities-img"/></span><span class="running-water-details">上水</span></li>
<li class="downriver-details-li"><span class="icon-bg-facilities"><img src="/app/images/icon_sewer@2x.png" class="supporting-facilities-img"/></span><span class="downriver-details">下水</span></li>
</ul>
</div>
<div style="height: 2rem;">
</div>
<!--line 5-->
<!--<div class="b4_font">
......@@ -181,8 +184,8 @@
<div class="slider3">
</div>-->
<p class="line_hr"></p>
<!--房源动态-->
<!--<p class="line_hr"></p>
<div class="b4_font">
<p class="b4_font_p">
房源动态
......@@ -217,17 +220,18 @@
</li>
</ul>
</div>
<p class="line_hr"></p>
<p class="line_hr"></p>-->
<!--下载app部分-->
<div class="public fix_area_top" style=" z-index: 9999999;top: 0;display: none;">
<img src="/app/images/pbl_cha.png" class="pbl_cha" />
<img src="/app/images/pbl_logo.png" class="pbl_logo" />
<img src="/app/images/img_logo@2x.png" class="pbl_logo" />
<p>
<span style="font-size: 0.24rem">更多优质真实的商铺信息</span>
<span style="font-size: 0.22rem; margin-top: 0.06rem;">请下载同联商业APP</span>
<span style="font-size: 0.24rem;margin-top: 0.33rem;">海量真实旺铺，就在同联商业 </span>
<!--<span style="font-size: 0.22rem; margin-top: 0.06rem;">请下载同联商业APP</span>-->
</p>
<a id="jump_link" href="javascript:;">
<img src="/app/images/pbl_dakai.png" class="pbl_xz">
<!--<img src="/app/images/img_btn@2x.png" class="pbl_xz">-->
<span class="pbl_xz">立即打开</span>
</a>
</div>
......
application/index/controller/CellPhone.php
View file @ 85110be8
......@@ -199,7 +199,7 @@ class CellPhone extends Basic
}
$call_phone = new CallPhoneService();
$data = $call_phone->agentsUnBind($this->params['phone_a'], $phone_b, $this->params['phone_x'], $user_id);
$data = $call_phone->agentsUnBindRedis($this->params['phone_a'], $phone_b, $this->params['phone_x'], $user_id, $this->userId);
$result['msg'] = '';
if ($data['status'] == 'success') {
$result['code'] = 200;
......
application/model/BindingPhone.php
View file @ 85110be8
......@@ -68,8 +68,8 @@ class BindingPhone extends BaseModel
$phone_data = $phone->where('phone_x', $phone_x)->find();
if ($phone_data['id']) {
$phone_data['bind_num'] -= 1;
$phone_data->save();
// $phone_data['bind_num'] -= 1;
// $phone_data->save();
$result = $this->where([
'aliYun_phone_id' => $phone_data['id'],
......@@ -143,12 +143,13 @@ class BindingPhone extends BaseModel
*/
public function unBindTable($id, $aliYun_phone_id)
{
$phone = new AliYunPhone();
$phone_data = $phone->field('id,bind_num')->where('id', $aliYun_phone_id)->find();
if ($phone_data['id']) {
$phone_data['bind_num'] -= 1;
$phone_data->save();
}
//由虚拟号码提供
// $phone = new AliYunPhone();
// $phone_data = $phone->field('id,bind_num')->where('id', $aliYun_phone_id)->find();
// if ($phone_data['id']) {
// $phone_data['bind_num'] -= 1;
// $phone_data->save();
// }
$this->update([ 'status' => 0, 'id' => $id ]);
return;
}
......@@ -173,8 +174,8 @@ class BindingPhone extends BaseModel
{
$m_ali_phone = new AliYunPhone();
$phone_id = $m_ali_phone->field('id,bind_num')->where('phone_x', $phone_x)->find();
$phone_id['bind_num'] += 1;
$m_ali_phone->where('id', $phone_id['id'])->update([ 'bind_num' => $phone_id['bind_num'] ]);
// $phone_id['bind_num'] += 1;
// $m_ali_phone->where('id', $phone_id['id'])->update([ 'bind_num' => $phone_id['bind_num'] ]); //由虚拟号码提供商记录
$insert_data['phone_a'] = $phone_a;
$insert_data['phone_b'] = $phone_b;
......
public/app/css/common.css
View file @ 85110be8
......@@ -228,10 +228,24 @@ display: none;}*/
/* 立即下载 */
.public{ width: 100%; height:1rem; background:rgba(0,0,0,0.7); position: fixed; bottom: 0;z-index: 300;}
.pbl_cha{width: 0.19rem; height: 0.19rem;display: block; float: left; margin-left: 0.26rem; margin-top: 0.17rem;}
.pbl_logo{width: 0.65rem; height: 0.65rem;display: block;float: left; margin-left: 0.44rem; margin-top: 0.17rem;}
.public p{ width: 3.2rem; float: left; margin-left: 0.2rem;}
.public p span{width: 100%; float: left;display: block;color: #FFFFFF;font-size: 0.28rem; margin-top: 0.13rem;}
.pbl_xz{ width: 1.8rem; height: 0.6rem; display: block;; float: right;margin-right: 0.26rem; margin-top: 0.2rem;}
.pbl_logo{width: 0.65rem; height: 0.65rem;display: block;float: left; margin-left: 0.4rem; margin-top: 0.17rem;}
.public p{ width: 3.6rem; float: left; margin-left: 0.2rem;}
.public p span{width: 100%; float: left;display: block;color: #FFFFFF;font-size: 0.28rem; margin-top: 0.13rem;letter-spacing:1px;}
.pbl_xz{ width: 1.4rem;
height: 0.5rem;
display: block;
float: right;
margin-right: 0.26rem;
margin-top: 0.24rem;
font-size:.2rem;
background-color: #ff9419;
color: #fff;
text-align: center;
line-height: .5rem;
border-radius: .25rem;
letter-spacing: 1px;
}
/*定义加载的动画*/
@keyframes loader4 {
from {
......
public/app/css/details_tl.css
View file @ 85110be8
......@@ -335,6 +335,7 @@
.supporting-facilities{
width: 100%;
margin-bottom: 1.2rem;
}
.supporting-facilities>li{
......
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