Merge branch 'master' of https://t-git.51gjj.com/fangbin/51business

app/controller/house/v2/new_house.js

@@ -57,6 +57,15 @@ class NewHouseController extends Controller {
 
         ctx.success({ results });
     }
+
+    /**
+    * 新房支持的城市列表
+     */
+    async getNewHouseCity() {
+        const { ctx } = this;
+        const ret = await ctx.service.house.v2.newHouse.getNewHouseCity();
+        ctx.success(ret);
+    }
 }
 
 module.exports = NewHouseController;

app/model/realestate/new_house_city_price.js

+'use strict';
+
+const moment = require('moment');
+
+module.exports = app => {
+    const { STRING, INTEGER, DATE } = app.Sequelize;
+    const NewHouseCityPrice = app.realestateModel.define('new_house_city_price', {
+        id: {
+            type: INTEGER,
+            allowNull: false,
+            primaryKey: true,
+            autoIncrement: true,
+        },
+        city: {
+            type: STRING,
+            allowNull: true
+        },
+        code: {
+            type: INTEGER,
+            allowNull: true
+        },
+        price: {
+            type: INTEGER,
+            allowNull: true
+        },
+        state: {
+            type: INTEGER,
+            allowNull: true
+        },
+    }, {
+            timestamps: false,
+            tableName: 'new_house_city_price',
+        });
+
+
+    return NewHouseCityPrice;
+
+};

app/router/house.js

@@ -82,6 +82,8 @@ module.exports = app => {
     router.get('/v2/new_house/:id', 'house.v2.newHouse.getNewHouse');//新房具体信息
     router.get('/v2/new_house/options/:city_code', 'house.v2.options.getNewHouseOptions');//筛选项信息
     router.get('/v2/new_house/list/recommend/', 'house.v2.newHouse.getRecommendNewHouses');//推荐的新房楼盘 基本可通用
+    router.get('/v2/new_house/city/list', 'house.v2.newHouse.getNewHouseCity');//新房支持的城市
+
 
     //关注
     router.post('/v2/collection', loginAuth, 'house.v2.collection.addCollection');//关注

app/service/house/v2/new_house.js

@@ -506,6 +506,31 @@ class NewHouseService extends Service {
         return { city, county, region };
     }
 
+    //新房支持的城市
+    async getNewHouseCity() {
+        const { ctx } = this;
+        //所有支持的城市编码
+        let filter = {
+            attributes: ['code'],
+            where: {
+                valid: 1
+            }
+        }
+        let cityCode = await ctx.realestateModel.NewHouseCityPrice.findAll(filter);
+        let ret = { results: [] };
+        if (cityCode !== undefined && cityCode.length > 0) {
+            let cityCodes = _.uniq(_.map(cityCode, 'code'));
+            let cityFilter = {
+                where: { code: { $in: cityCodes } }
+            }
+            let cityName = await ctx.blockModel.City.findAll(cityFilter);
+            ret.results = cityName !== undefined ? cityName : [];
+        }
+        return ret;
+    }
+
+
+
 }
 
 module.exports = NewHouseService;