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

app/controller/house/v2/tool.js

@@ -256,7 +256,7 @@ class ToolController extends Controller {
         for (let i in city_list) {
             const city = city_list[i];
             const children = districts.filter(item => { return (parseInt(item.city_id) === parseInt(city.code)) ? true : false });
-            city._children = children.map(item => { return { id: item.id, name: item.name, code: item.name } });
+            city._children = children.map(item => { return { id: item.id, name: item.name, code: item.id } });
             results.push(city);
         }
 

app/service/house/v2/rental_house.js

@@ -80,23 +80,22 @@ class RentalHouseService extends Service {
         const house_types_rets = await ctx.realestateModel.RentalHouseType.all({ where: { rental_house_id: rental_house_id, status: 'online', valid: 1 } });
         const p_house_images = ctx.service.house.v2.houseImage.getAll({ type: 1, connect_id: rental_house_id }, ['id', 'path', 'description']);
         const p_house_types = this.formatRentHouseTypes(house_types_rets);
-        const p_ret = await Promise.all([p_house_images, p_house_types]).then(result => {//等待所有异步内容获取完成
+        const p_collection = await ctx.service.house.v2.collection.getCollection({ type: 2, id: rental_house_id });
+        const p_ret = await Promise.all([p_house_images, p_house_types, p_collection]).then(result => {//等待所有异步内容获取完成
             return result;
         }).catch(error => {
             ctx.failed(error);
         });
         const house_images = p_ret[0];
         const house_types = p_ret[1];
+        const collection = p_ret[2];//是否关注
 
         //处理房源基本信息格式
         let house_basic = await this.formatRentalHouseBasic([rental_house_info]);
         house_basic = house_basic[0];
 
-        //添加用户足迹，是否关注过房源
-        await ctx.service.house.v2.footPrint.addFootPrint({ type: 2, id: rental_house_id });
-        //是否关注
-        let collectionTask = await ctx.service.house.collection.getCollection({ type: 2, id: rental_house_id });
-
+        //添加用户足迹
+        ctx.service.house.v2.footPrint.addFootPrint({ type: 2, id: rental_house_id });
 
         const city_codes = [rental_house_info.province, rental_house_info.city, rental_house_info.area];
         const cities = await ctx.blockModel.City.all({ where: { code: { $in: city_codes } } });
@@ -106,7 +105,7 @@ class RentalHouseService extends Service {
         house_basic.longitude = gps_info.lng;
         house_basic.latitude = gps_info.lat;
 
-        return { house_basic, house_images, house_types, collection: collectionTask, };
+        return { house_basic, house_images, house_types, collection: collection.length > 0 ? true : false, };
     }
 
     //格式化户型数据