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

app/controller/house/tool.js

@@ -156,7 +156,8 @@ class ToolController extends Controller {
             down_payment: { type: 'string', required: true },
             invest_payment: { type: 'string', required: true },
             total_price: { type: 'string', required: true },
-            prepare_time: { type: 'string', required: true }
+            prepare_time: { type: 'string', required: true },
+            house_style: { type: 'string', required: false },
         }
         ctx.validate(rule, input_parmas);
         if (!parseFloat(input_parmas.invest_payment)) {
@@ -169,25 +170,42 @@ class ToolController extends Controller {
         const area_code = input_parmas.area_code;
         const total_price = parseFloat(input_parmas.total_price);
         const area_name = input_parmas.area_name;
+
+        const house_style = input_parmas.house_style ? input_parmas.house_style : 'new_house';
+
+
         let filter = {
             total_price: { min: total_price - 30, max: total_price + 30 },
             area_code: { bizcircle_code: area_code },
         }
         let recommend_houses = await ctx.service.house.newHouse.getNewHouseList(filter);//推荐房源
 
+        let house_map;
+        let district_code;
         if (recommend_houses.count === 0) {
-            filter = {
-                total_price: { min: total_price - 30, max: total_price + 30 },
-                area_code: { district_code: area_code },
+
+            if (house_style === 'new_house') {
+                house_map = await ctx.blockModel.HouseNewHousePriceMap2.one({ where: { id: area_code } });
+            } else if (house_style === 'used_house') {
+                house_map = await ctx.blockModel.HousePriceMap3.one({ where: { id: area_code } });
             }
+            district_code = (house_map && house_map.pid) ? house_map.pid : '';
+
+            filter.area_code = { district_code: district_code }
             recommend_houses = await ctx.service.house.newHouse.getNewHouseList(filter);//推荐房源
         }
 
         if (recommend_houses.count === 0) {
-            filter = {
-                total_price: { min: total_price - 30, max: total_price + 30 },
-                area_code: { city_code: area_code },
+
+            let city_code;
+            if (house_style === 'new_house') {
+                house_map = await ctx.blockModel.HouseNewHousePriceMap.one({ where: { id: district_code } });
+            } else if (house_style === 'used_house') {
+                house_map = await ctx.blockModel.HousePriceMap2.one({ where: { id: district_code } });
+                house_map = await ctx.blockModel.HousePriceMap.one({ where: { id: house_map.pid } });
             }
+            city_code = (house_map && house_map.pid) ? house_map.pid : '';
+            filter.area_code = { city_code: city_code };
             recommend_houses = await ctx.service.house.newHouse.getNewHouseList(filter);//推荐房源
         }
         recommend_houses = recommend_houses.results.splice(0, 4);