法大大预定修改！

c9c61097 · 游宗学 · 86243c95 · c9c61097 · c9c61097 · c9c61097
--- a/PHP/Application/BookingWap/View/default/CustomTemplate/subleaseTemplate.html
+++ b/PHP/Application/BookingWap/View/default/CustomTemplate/subleaseTemplate.html
@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <div style="font-size:16px;line-height:150%;padding:30px 10px">
-    <p style=";text-align: center;font-family: 'Times New Roman';font-size:14px;white-space: normal;line-height: 24px"><strong><span style="font-family: 楷体_GB2312;letter-spacing: 1px;font-size:24px"><span style="font-family:楷体_GB2312">房屋转租服务合同</span></span></strong></p>
+    <p style=";text-align: center;font-family: 'Times New Roman';font-size:14px;white-space: normal;line-height: 24px"><strong><span style="font-family: 楷体_GB2312;letter-spacing: 1px;font-size:24px"><span style="font-family:楷体_GB2312">房屋续住服务合同</span></span></strong></p>
    <p style=";font-family: 'Times New Roman';font-size:14px;white-space: normal;line-height: 24px"><span style="font-family: 宋体;letter-spacing: 1px;font-size:14px">　　 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="font-family:宋体">编号：<span style="color:red">{{$parameter.old_contract_number}}</span></span></span></p>
    <p style=";font-family: 'Times New Roman';font-size:14px;white-space: normal;line-height: 24px"><span style="font-family: Arial;letter-spacing: 1px;font-size:14px">&nbsp;</span></p>
    <p style=";font-family: 'Times New Roman';font-size:14px;white-space: normal;line-height: 24px"><span style="font-family: 宋体;letter-spacing: 1px;font-size:14px"><span style="font-family:宋体">甲方：<span style="color:red">{{$parameter.jf_bot}}</span></span></span></p>

--- a/PHP/Application/Common/Helper/Fdd/ExtsignHelper.class.php
+++ b/PHP/Application/Common/Helper/Fdd/ExtsignHelper.class.php
@@ -287,6 +287,11 @@ class ExtsignHelper extends BaseHelper
        if (! $result) {
            return $this->errorStatus('exsign_filing');
        }
+        //更新退租法大大
+        $where['surrender_id'] = ['eq',$surrender_id];
+        $save_data['is_sign'] = 1;
+        $save_data['fdd_id']  = $contract_number_id;
+        $this->helper("Surrender")->updateWhere($where, $save_data);
        return $this->successStatus('签署成功');
    }


--- a/PHP/Application/Common/Logic/Message/MessageLogic.class.php
+++ b/PHP/Application/Common/Logic/Message/MessageLogic.class.php
@@ -176,6 +176,10 @@ class MessageLogic extends BaseLogic
                $datas['message_name'] = '你有一条审批待办, 请及时处理';
                break;

+            case GeneralMessagePushModel::$push_code['APPLY_RENEWALS']:
+                $datas['message_type'] = '1';
+                $datas['message_name'] = $room['room_number'].'房间申请续租';
+                break;
            default:
                return array('status' => 0, 'message' => '[M0002]不被允许的push_code');
        }

--- a/PHP/Application/Common/Model/General/GeneralMessagePushModel.class.php
+++ b/PHP/Application/Common/Model/General/GeneralMessagePushModel.class.php
@@ -33,6 +33,7 @@ class GeneralMessagePushModel extends BaseModel {
        'CLEANING'                    => 'cleaning',
        'CUSTOMER_WITH'               => 'customer_with',
        'APPROVAL_PRICE'              => 'approval_price',
+        'APPLY_RENEWALS'              => 'apply_renewals',
    ];

 }
\ No newline at end of file
--- a/PHP/Application/Fdd/Controller/ApiController.class.php
+++ b/PHP/Application/Fdd/Controller/ApiController.class.php
@@ -92,8 +92,8 @@ class ApiController extends \Common\Controller\BaseFddController{
    }

    /**
-     * @name 签约转租协议
-     * @version 2020-05-27
+     * @name 签约续住协议
+     * @version 2020-05-28
     * @author yzx
     */
    public function subleaseData(){

--- a/PHP/Application/Fdd/Controller/TemplateController.class.php
+++ b/PHP/Application/Fdd/Controller/TemplateController.class.php
@@ -658,7 +658,7 @@ class TemplateController extends BaseFddController
        // 丙方签名
        $transaction_id = date('YmdHis') . str_pad(rand(0, 399), 3, '0');
        $customer_id = $this->helper('Fdd\UserInfo')->getUserCaId($tenant_id);
-        $result = $this->helper('Fdd\Contract')->extsign($contract_number_id, $transaction_id, $customer_id, $third_sign, '', 1, 3, '入住');
+        $result = $this->helper('Fdd\Contract')->extsign($contract_number_id, $transaction_id, $customer_id, $third_sign, '', 1, 3, '续住');
        if (! $result) {
            return RD('exsign_first');
        }
@@ -681,7 +681,7 @@ class TemplateController extends BaseFddController
        // 如果没有查到ca证书就不签章
        if (! empty($scene_data['data'])) {
            $transaction_id = date('YmdHis') . str_pad(rand(399, 699), 3, '0');
-            $result = $this->helper('Fdd\Contract')->extsign($contract_number_id, $transaction_id, $customer_id, $first_sign, '', 1, 3, '入住');
+            $result = $this->helper('Fdd\Contract')->extsign($contract_number_id, $transaction_id, $customer_id, $first_sign, '', 1, 3, '续住');
            WL($result, 'test-sign', 1);
            if (! $result) {
                return RD('exsign_second');
@@ -701,26 +701,9 @@ class TemplateController extends BaseFddController
        $where['company_id'] = ['exp', '!= 0'];
        $save_data['fdd_id'] = $contract_number_id;
        $save_data['is_sign'] = 1;
-        $save_data['company_id'] = $contract_info['company_id'];
-        $_result = D('Contract')->where($where)
+        $_result = D('Renewals')->where($where)
            ->data($save_data)
            ->save();
-        // 发送短信
-        $room_info = $this->helper('Room')->getDataById($contract_info['room_id']);
-        $phone = $tenant_info['phone'];
-        $message = '乐友，您已签约入住乐乎，登陆APP即可查看电子合同，下载APP：http://dwz.cn/6q6ptA';
-
-        // 兼容有朋签约
-        $signature = '【乐乎】';
-        $organization_id = $this->helper('Company')->getOne(['company_id' => $contract_info['company_id'], 'organization_id' => ['exp', '!= 0']], 'organization_id')['data'];
-        $organization    =  $this->helper('Organization')->getOne(['organization_id' => $organization_id['organization_id']], 'organization_id, name')['data'];
-
-        if ($organization['organization_id'] != 1) {
-            $message   = '尊敬的客户，恭喜您已成功办理入住签约！';
-            $signature = '【' . $organization['name'] . '】';
-        }
-
-        $res = $this->helper('SmsCaptcha')->sendMessage($phone, $message, $signature,false,$room_info['apartment_id']?:0);
        return RD('签署成功', $contract_number_id, 1);
    }
 }
--- a/PHP/Htdoc/Upload/ContractHtmlTmplate/subleaseTemplate.html
+++ b/PHP/Htdoc/Upload/ContractHtmlTmplate/subleaseTemplate.html
@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <div style="font-size:16px;line-height:150%;padding:30px 10px">
-    <p style=";text-align: center;font-family: 'Times New Roman';font-size:14px;white-space: normal;line-height: 24px"><strong><span style="font-family: 楷体_GB2312;letter-spacing: 1px;font-size:24px"><span style="font-family:楷体_GB2312">房屋转租服务合同</span></span></strong></p>
+    <p style=";text-align: center;font-family: 'Times New Roman';font-size:14px;white-space: normal;line-height: 24px"><strong><span style="font-family: 楷体_GB2312;letter-spacing: 1px;font-size:24px"><span style="font-family:楷体_GB2312">房屋续住服务合同</span></span></strong></p>
    <p style=";font-family: 'Times New Roman';font-size:14px;white-space: normal;line-height: 24px"><span style="font-family: 宋体;letter-spacing: 1px;font-size:14px">　　 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="font-family:宋体">编号：<span style="color:red">{{$parameter.old_contract_number}}</span></span></span></p>
    <p style=";font-family: 'Times New Roman';font-size:14px;white-space: normal;line-height: 24px"><span style="font-family: Arial;letter-spacing: 1px;font-size:14px">&nbsp;</span></p>
    <p style=";font-family: 'Times New Roman';font-size:14px;white-space: normal;line-height: 24px"><span style="font-family: 宋体;letter-spacing: 1px;font-size:14px"><span style="font-family:宋体">甲方：<span style="color:red">{{$parameter.jf_bot}}</span></span></span></p>

--- a/PHP/sql/preordain-2020-05-28.sql
+++ b/PHP/sql/preordain-2020-05-28.sql
+ALTER TABLE `preordain` ADD `is_sign` TINYINT(1)  UNSIGNED  NOT NULL  DEFAULT '0'  COMMENT '是否签约';
+ALTER TABLE `preordain` ADD `fdd_id` VARCHAR(32)  NOT NULL  DEFAULT '0'  COMMENT '法大大ID';
--- a/PHP/sql/renewals-2020-05-28.sql
+++ b/PHP/sql/renewals-2020-05-28.sql
+ALTER TABLE `renewals` ADD `fdd_id` VARCHAR(32)  NOT NULL  DEFAULT '0'  COMMENT '法大大ID';
+ALTER TABLE `renewals` ADD `is_sign` TINYINT(1)  UNSIGNED  NOT NULL  DEFAULT '0'  COMMENT '是否签约';
--- a/PHP/sql/surrender-2020-05-28.sql
+++ b/PHP/sql/surrender-2020-05-28.sql
+ALTER TABLE `surrender` ADD `is_sign` TINYINT(1)  UNSIGNED  NOT NULL  DEFAULT '0'  COMMENT '是否签约'  AFTER `delete_time`;
+ALTER TABLE `surrender` ADD `fdd_id` VARCHAR(32)  NOT NULL  DEFAULT '0'  COMMENT '法大大ID'  AFTER `is_sign`;