提交 8ca9d647 authored 作者: 游宗学's avatar 游宗学

短信修改

上级 6ea418c4
...@@ -112,9 +112,9 @@ class SmsCaptchaHelper extends BaseHelper ...@@ -112,9 +112,9 @@ class SmsCaptchaHelper extends BaseHelper
//代理出了问题 //代理出了问题
// if (!$this->restrictionIp($ip) && !$isSysSms) return '此IP地址发送短信太过频繁!'; // if (!$this->restrictionIp($ip) && !$isSysSms) return '此IP地址发送短信太过频繁!';
if (!$this->restrictionPhone($phone)) return '此手机号码发送短信太过频繁!'; if (!$this->restrictionPhone($phone)) return '此手机号码发送短信太过频繁!';
$result = $this->sendMessage($phone, $message, '【乐乎】', false, $apartment_id = 0, $already_write = 1); // $result = $this->sendMessage($phone, $message, '【乐乎】', false, $apartment_id = 0, $already_write = 1);
// if ($result==false){ // if ($result==false){
// $result = $this->sendAliyuCodeMessage($phone, '【乐乎】', $code); $result = $this->sendAliyuCodeMessage($phone, '【回家理想乡】', $code);
// } // }
return $result; return $result;
} }
......
...@@ -406,6 +406,7 @@ class TenantHelper extends BaseHelper{ ...@@ -406,6 +406,7 @@ class TenantHelper extends BaseHelper{
c.room_id, c.room_id,
AES_DECRYPT(t.phone,'" . C('TENANT_CRYPT') . "') as phone, AES_DECRYPT(t.phone,'" . C('TENANT_CRYPT') . "') as phone,
AES_DECRYPT(t.idcard,'" . C('TENANT_CRYPT') . "') as idcard, AES_DECRYPT(t.idcard,'" . C('TENANT_CRYPT') . "') as idcard,
AES_DECRYPT(t.emergency_phone,'" . C('TENANT_CRYPT') . "') as emergency_phone,
c.begin_time, c.begin_time,
c.end_time, c.end_time,
c.rental, c.rental,
...@@ -441,8 +442,8 @@ class TenantHelper extends BaseHelper{ ...@@ -441,8 +442,8 @@ class TenantHelper extends BaseHelper{
ss.sales_sources_name, ss.sales_sources_name,
c.is_new, c.is_new,
t.emergency_contact, t.emergency_contact,
t.emergency_phone, t.gender,
t.idcard_type, t.interpersonal_relation_configuration_id,
t.remarks as tenant_remarks" t.remarks as tenant_remarks"
) )
->alias('c') ->alias('c')
...@@ -464,6 +465,8 @@ class TenantHelper extends BaseHelper{ ...@@ -464,6 +465,8 @@ class TenantHelper extends BaseHelper{
$surrender_contract_id = []; $surrender_contract_id = [];
$url_data = SITE_DOMAIN; $url_data = SITE_DOMAIN;
$http = 'https'; $http = 'https';
$interpersonal_relation_configuration_id = [];
$interpersonal_relation_configuration = [1=>'父亲',2=>'母亲',3=>'儿女',4=>'同事',5=>'朋友',6=>'兄妹',7=>'其他',8=>'配偶'];
foreach ($tenant_list_data as $k => $v) { foreach ($tenant_list_data as $k => $v) {
$advance_pay_rent_day = $v['advance_pay_rent_day']; $advance_pay_rent_day = $v['advance_pay_rent_day'];
$nex_pay_day = convert_pay($temp_pay_config[$v['how_pay']]); $nex_pay_day = convert_pay($temp_pay_config[$v['how_pay']]);
...@@ -490,6 +493,10 @@ class TenantHelper extends BaseHelper{ ...@@ -490,6 +493,10 @@ class TenantHelper extends BaseHelper{
$tenant_list_data[$k]['reservation_surrender_time'] = $v['reservation_surrender_time'] > 0 ? date("Y-m-d", $v['reservation_surrender_time']) : ''; $tenant_list_data[$k]['reservation_surrender_time'] = $v['reservation_surrender_time'] > 0 ? date("Y-m-d", $v['reservation_surrender_time']) : '';
$tenant_list_data[$k]['surrender_time'] = $v['surrender_time'] ? date('Y-m-d', $v['surrender_time']) : ''; $tenant_list_data[$k]['surrender_time'] = $v['surrender_time'] ? date('Y-m-d', $v['surrender_time']) : '';
$tenant_list_data[$k]['sign_status'] = $isSigned[$tenant_list_data[$k]['is_sign']]; $tenant_list_data[$k]['sign_status'] = $isSigned[$tenant_list_data[$k]['is_sign']];
$tenant_list_data[$k]['interpersonal_relation'] = $interpersonal_relation_configuration[$v['interpersonal_relation_configuration_id']];
$tenant_list_data[$k]['room_rental'] = $v['rental'];
$tenant_list_data[$k]['gender'] = $v['gender']==1?"男":"女";
$pdfUrl = $http . '://' . $url_data . '/ContractIous/getPDFById'; $pdfUrl = $http . '://' . $url_data . '/ContractIous/getPDFById';
$tenant_list_data[$k]['pdf_url'] = $pdfUrl; $tenant_list_data[$k]['pdf_url'] = $pdfUrl;
$contract_ids[] = $v['contract_id']; $contract_ids[] = $v['contract_id'];
...@@ -501,6 +508,7 @@ class TenantHelper extends BaseHelper{ ...@@ -501,6 +508,7 @@ class TenantHelper extends BaseHelper{
if (empty($contract_ids)) { if (empty($contract_ids)) {
return ["status" => 1, 'data' => [], "count" => 0, 'is_con_tpl_conf' => 0]; return ["status" => 1, 'data' => [], "count" => 0, 'is_con_tpl_conf' => 0];
} }
//获取委托转租数据 //获取委托转租数据
$reservation_surrender_where['contract_id'] = ['in',$contract_ids]; $reservation_surrender_where['contract_id'] = ['in',$contract_ids];
$reservation_surrender_where['entrust_surrender'] = ['eq',1]; $reservation_surrender_where['entrust_surrender'] = ['eq',1];
......
...@@ -79,7 +79,12 @@ class ContractTemplateHeadLogic extends BaseLogic ...@@ -79,7 +79,12 @@ class ContractTemplateHeadLogic extends BaseLogic
'ueto_employee_name' => ['value' => "上户", 'is_show' => 0], 'ueto_employee_name' => ['value' => "上户", 'is_show' => 0],
'with_employee_name' => ['value' => "带户", 'is_show' => 0], 'with_employee_name' => ['value' => "带户", 'is_show' => 0],
'surrender_time' => ['value' => "退租时间", 'is_show' => 1], 'surrender_time' => ['value' => "退租时间", 'is_show' => 1],
'create_time' => ['value' => "创建时间", 'is_show' => 0] 'create_time' => ['value' => "创建时间", 'is_show' => 0],
'emergency_phone' => ['value' => "紧急联系人电话", 'is_show' => 1],
'emergency_contact' => ['value' => "紧急联系人", 'is_show' => 1],
'gender' => ['value' => "租客性别", 'is_show' => 1],
'interpersonal_relation' => ['value' => "紧急联系人关系", 'is_show' => 1],
'contract_number' => ['value' => "合同编号", 'is_show' => 1],
]; ];
return $head_info; return $head_info;
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论