house v2 fix

app/controller/house/v2/tool.js

@@ -282,24 +282,35 @@ class ToolController extends Controller {
         const input_parmas = ctx.params;
         const rule = {
             type: { type: 'string', required: true },
-            area_code: { type: 'string', required: true },
+            city_code: { type: 'string', required: true },
         }
         ctx.validate(rule, input_parmas);
 
         const type = input_parmas.type;
-        const area_code = input_parmas.area_code;
+        const city_code = input_parmas.city_code;
+        const area_code = ctx.query.area_code;
+        console.info(area_code);
+
         let ret = [];
         if (type === 'trend') {
-            ret = await ctx.blockModel.HousePriceTrend.one({ where: { id: area_code } });
+            if (area_code) {
+                ret = await ctx.blockModel.HousePriceTrend2.one({ where: { id: area_code, pid: city_code } });
+            } else {
+                ret = await ctx.blockModel.HousePriceTrend.one({ where: { id: city_code } });
+            }
             ret = ret ? ret.trend_json : [];
         } else if (type === 'increase') {
-            ret = await ctx.blockModel.HousePriceIncrease.one({ where: { id: area_code } });
+            ret = await ctx.blockModel.HousePriceIncrease.one({ where: { id: city_code } });
             ret = ret ? ret.increase_json : [];
         } else if (type === 'question') {
-            ret = await ctx.blockModel.HouseQuestion.one({ where: { id: area_code } });
+            ret = await ctx.blockModel.HouseQuestion.one({ where: { id: city_code } });
             ret = ret ? ret.question_json : [];
         } else if (type === 'supply') {
-            ret = await ctx.blockModel.HouseSupplyDemand.one({ where: { id: area_code } });
+            if (area_code) {
+                ret = await ctx.blockModel.HouseSupplyDemand2.one({ where: { id: area_code, pid: city_code } });
+            } else {
+                ret = await ctx.blockModel.HouseSupplyDemand.one({ where: { id: city_code } });
+            }
             ret = ret ? ret.supply_demand_json : [];
         }
 

app/router/house.js

@@ -52,7 +52,7 @@ module.exports = app => {
     router.get('/v2/tool/:house_style/:area_code/:level', 'house.v2.tool.getMapPoint');//购房计划地图点位(存钱罐地图)（房价地图）
     router.post('/v2/tool/plan', 'house.v2.tool.generateBuyHousePlan');//生成购房计划
     router.get('/v2/tool/plan_area_list', 'house.v2.tool.planAreaList');//购房计划页面 区域列表接口
-    router.get('/v2/tool/:type/:area_code', 'house.v2.tool.getHousePriceFeature');//房价走势图 房价涨跌图 购房资格图、贷款额度问答、供需趋势图
+    router.get('/v2/tool/:type/:city_code', 'house.v2.tool.getHousePriceFeature');//房价走势图 房价涨跌图 购房资格图、贷款额度问答、供需趋势图
     router.post('/v2/tool/calculate_price', 'house.tool.calculateHousePrice');//房产估价
     router.get('/v2/tool/qfang_area_list', 'house.tool.getQFangAreaList');//房产估价模糊匹配到的小区列表
     router.get('/v2/tool/map_houses', 'house.tool.getMapHouses');//房产估价模糊匹配到的小区列表