合同修改！

PHP/Application/BookingWap/Controller/CustomTemplateController.class.php

@@ -40,6 +40,33 @@ class CustomTemplateController extends BaseBookingWapController
         $data          = [
             'service_code'  => $finance_model::PREORDAIN,
             'apartment_id'  => I('apartment_id'),
+            'preordain_id'  => I('preordain_id'),
+            'room_id'       => I('room_id'),
+            'tenant_id'     => I("tenant_id"),
+            'full_page'     => I('full_page', 0, 'intval'),
+        ];
+        $parameter = $this->logic('CustomTemplate\CustomTemplate')->mainCustomTemplate($data);
+        if ($parameter['status'] == 0) {
+            $this->ajaxReturn($parameter);
+        }
+        $this->assign('parameter', $parameter['data']['parameter']);
+        $template_name = $parameter['data']['template_name']?$parameter['data']['template_name']:'preordainTemplate';
+        $this->display($parameter['data']['template_name']);
+    }
+    /**
+     * @version 2018年05月16日09:22:23
+     * @author zsc
+     * @desc M站预定模板
+     */
+    public function reservationSurrenderTemplate()
+    {
+        $finance_model = D('FinanceScene\SceneService');
+        $data          = [
+            'service_code'  => $finance_model::RESERVATION_SURRENDER,
+            'apartment_id'  => I('apartment_id'),
+            'preordain_id'  => I('preordain_id'),
+            'room_id'       => I('room_id'),
+            'tenant_id'     => I("tenant_id"),
             'full_page'     => I('full_page', 0, 'intval'),
         ];
         $parameter = $this->logic('CustomTemplate\CustomTemplate')->mainCustomTemplate($data);
@@ -47,6 +74,7 @@ class CustomTemplateController extends BaseBookingWapController
             $this->ajaxReturn($parameter);
         }
         $this->assign('parameter', $parameter['data']['parameter']);
+        $template_name = $parameter['data']['template_name']?$parameter['data']['template_name']:'preordainTemplate';
         $this->display($parameter['data']['template_name']);
     }
 

PHP/Application/Common/Logic/CustomTemplate/CustomTemplateLogic.class.php

@@ -430,9 +430,15 @@ class CustomTemplateLogic extends BaseLogic
      */
     private function preordainWapTemplate($data)
     {
+        $apartment_id = $data['apartment_id'];
+        $tenant_id    = $data['tenant_id'];
+        $room_id      = $data['room_id'];
+        $preordain_id = $data['preordain_id'];
         //占个坑-没什么用
-        $param = [];
-        return RD('成功', 1, $param);
+        $jf_data            = $this->logic('Fdd\FddData')->jfData($apartment_id, 'preordain')['data'];
+        $preordain_data     =  $this->logic('Fdd\FddData')->preordainData($tenant_id, $room_id,$preordain_id)['data'];
+        $param             = array_merge($jf_data, $preordain_data);
+        return ['status' => 1, 'message' => '成功', 'data' => $param];
     }
 
     /**

PHP/Application/Common/Model/FinanceScene/SceneServiceModel.class.php

@@ -27,10 +27,8 @@ class SceneServiceModel extends BaseModel
     const CANCELED              = 'canceling';
     const TENANT_AUTH           = 'tenant_auth';
     const AHA_STYLE             = 'aha_style';
-    const SUBLEASE              = 'sublease';
     // 业务代码名称
     public static $serviceCodeName = [
-        self::SUBLEASE              => '转租',
         self::PREORDAIN             => '预定',
         self::CONTRACT_FINANCE      => '合同账单',
         self::IOUS_FINANCE          => '分期账单',
@@ -51,7 +49,6 @@ class SceneServiceModel extends BaseModel
         self::AHA_STYLE             => '阿哈生活',
     ];
     public static $serviceCodeEnName = [
-        self::SUBLEASE,
         self::PREORDAIN,
         self::CONTRACT_FINANCE,
         self::IOUS_FINANCE,

PHP/Application/Fdd/Controller/TemplateController.class.php

@@ -694,14 +694,14 @@ class TemplateController extends BaseFddController
         if (! $result) {
             return RD('exsign_filing');
         }
-        $where['contract_id'] = [
-            'eq',
-            $contract_info['contract_id']
-        ];
+
         $where['company_id']  = ['exp', '!= 0'];
+        $where['contract_id'] = ['eq', $contract_id];
+        $where['bill_id']     = ['gt', 0];
+        $where['is_pay']      = ['eq', 1];
         $save_data['fdd_id'] = $contract_number_id;
         $save_data['is_sign'] = 1;
-        $_result = D('Renewals')->where($where)
+        $_result = D('ReservationSurrender')->where($where)
             ->data($save_data)
             ->save();
         return RD('签署成功', $contract_number_id, 1);

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 '是否签约';

PHP/sql/reservation_surrender-2020-05-28.sql

+ALTER TABLE `reservation_surrender` ADD `fdd_id` VARCHAR(32)  NOT NULL  DEFAULT '0'  COMMENT '法大大ID';
+ALTER TABLE `reservation_surrender` ADD `is_sign` TINYINT(1)  UNSIGNED  NOT NULL  DEFAULT '0'  COMMENT '是否签约';