add loan_type

app/service/house/v2/new_house.js

@@ -14,6 +14,7 @@ const HOUSE_TYPE = [
     { name: '5室以上', min: 5, max: 10000, value: 6, },
     { name: '别墅', min: 10000, max: 10000000, value: 7, },
 ]
+const SaleType = { 0: '未开售', 1: '售罄', 2: '预售', 3: '在售' };
 
 class NewHouseService extends Service {
     /**
@@ -121,7 +122,6 @@ class NewHouseService extends Service {
      */
     async formatNewHouse(data) {
         const { ctx } = this;
-        const saleType = { 0: '未开售', 1: '售罄', 2: '预售', 3: '在售' };
         const decorationType = { 1: '毛坯', 2: '简装', 3: '精装' }
         const archType = { 1: '板楼', 2: '塔楼' };
         let ret = {};
@@ -202,7 +202,7 @@ class NewHouseService extends Service {
                     decoration: decorationType[data.decoration_type] || '',//装修情况，1 毛坯，2简装，3精装
                 },
                 sale: {
-                    sale_type: saleType[data.sale_type] || '',//销售状态 0未开售，1售罄,2预售,3在售
+                    sale_type: SaleType[data.sale_type] || SaleType[3],//销售状态 0未开售，1售罄,2预售,3在售
                     address: data.address,//地址
                     sale_address: data.sale_address,//售楼地址
                     developer: data.developer ? data.developer.name : '',//开发商
@@ -291,7 +291,6 @@ class NewHouseService extends Service {
      */
     async formatNewHouseType(data) {
         const { ctx } = this;
-        const saleType = { 0: '未开售', 1: '售罄', 2: '预售', 3: '在售' };
         let ret = {};
         if (Object.keys(data).length > 0) {
             ret = {
@@ -301,7 +300,7 @@ class NewHouseService extends Service {
                 house_type: data.house_type.split(',').slice(0, 2),
                 image: data.image,
                 apartment: data.apartment,//户型，如4室2厅3卫
-                sale_type: saleType[data.sale_type] || '',
+                sale_type: SaleType[data.sale_type] || '',
                 area: Number(data.area),//面积
                 orientation: data.orientation,//朝向
                 num: data.num,//房源数量
@@ -374,9 +373,10 @@ class NewHouseService extends Service {
                     valid: 1
                 }
             }
-            if (condition.house_type) {
-                newHouseTypeFilter.where.type = condition.house_type;
-            }
+            //v2.1去掉户型筛选,替换为贷款方式
+            // if (condition.house_type) {
+            //     newHouseTypeFilter.where.type = condition.house_type;
+            // }
             if ((condition.area && condition.area.hasOwnProperty('min') && condition.area.hasOwnProperty('max'))) {
                 newHouseTypeFilter.where.area = { $between: [condition.area.min, condition.area.max] };
             }
@@ -385,6 +385,11 @@ class NewHouseService extends Service {
             filter.where.id = { $in: matchIds };
         }
 
+        //贷款方式
+        if (condition.loan_type) {
+            filter.where.loan_type = condition.loan_type;
+        }
+
         if (condition.name) {//关键词搜索 模糊查询
             //增加搜索历史
             let addHistory = {
@@ -432,6 +437,7 @@ class NewHouseService extends Service {
             image: newHouseInfo.image,
             price: Number(newHouseInfo.reference_avg_price) === 0 ? '--' : Number(newHouseInfo.reference_avg_price),
             corner: newHouseInfo.corner || '',
+            sale_type: SaleType[newHouseInfo.sale_type] || SaleType[3],//销售状态 0未开售，1售罄,2预售,3在售
         }
         return ret;
     }