Merge branch 'master' of http://git.house365.com/zhangkuanguang/fenzhan_agent

new_admincp/applications/zsb/controllers/sell.php

@@ -755,7 +755,7 @@ class Sell extends MY_Controller {
             }
         }
 
-        $fields_values['is_real_house'] = $real_house_set;
+        //$fields_values['is_real_house'] = $real_house_set;
 
 		//2016-2-25 zhou添加限制重复房源发布 -------- start ------------>
 
@@ -1232,7 +1232,6 @@ class Sell extends MY_Controller {
 			
             //日志记录房源状态
             $logesta = $fields_values['esta'];
-			
             if ($is_star_house || $is360 == '2')
             {
                 $exp = $gewp->findScoreByWayAliasAndPackageId('pStarHouse', $package_id);					 
@@ -2620,11 +2619,11 @@ class Sell extends MY_Controller {
         $this->load->model('real_house_model');
 
         //$fields_values['is_real_house'] = $real_house_set;
-
         $isRealHouse =$this->real_house_model->getInfoByRowid($house_id);
         $isRealHouseNew =$this->real_house_model->get_real_house_sell_info($house_id);
         //print_r($isRealHouseNew[0]['is_real_house']);die;
         //操作原因
+
 	    $this->load->model('zsb_api_model');
         if(($isRealHouseNew[0]['is_real_house']==0) && $real_house_set==1) {
 
@@ -3143,9 +3142,9 @@ class Sell extends MY_Controller {
                 //2018-5-21 增加操作标签原因：编辑房源后不满足多图条件
 				$this->sell_tag_model->remove_tag(5);
                 //取消REAL房
-                $this->load->model('sell_real_model');
+              /*  $this->load->model('sell_real_model');
                 $this->sell_real_model->set_houseinfo($fields_values);
-                $this->sell_real_model->remove_real();
+                $this->sell_real_model->remove_real();*/
                 //取消新房直售
                 $this->load->model('sell_nofee_model');
                 $this->sell_nofee_model->set_houseinfo($fields_values);
@@ -3154,8 +3153,8 @@ class Sell extends MY_Controller {
             $page_text = '房源修改成功!' . $growthMessage;
             //房源冻结后的提醒信息
             //if ($check_rs=='freeze house'){
-			
-			if($fields_values['infotype'] == 1 && $resultHousePublishRule['system_intercept_status'])
+
+	        if($fields_values['infotype'] == 1 && $resultHousePublishRule['system_intercept_status'])
 			{
                 $page_text = '您发布的房源严重低于市场价格，已被系统自动拦截，如您需要继续发布，可在租售宝后台“系统拦截”中进行申诉，如果该房源被查出虚假，账号会被降1星。';
 				//=====20160819去更改申诉表里的申诉状态，result置为0（带审核）