fix

app/service/house/v2/new_house.js

@@ -153,17 +153,11 @@ class NewHouseService extends Service {
             let area = typeArea.min === typeArea.max ? Number(typeArea.min) : Number(typeArea.min) + '-' + Number(typeArea.max);
 
             //经纬度
-            const city = await ctx.blockModel.City.one({ where: { code: data.option_city_code } });
-            const county = await ctx.blockModel.HouseDistrict.one({ where: { id: data.option_district_code } });
-            const region = await ctx.blockModel.HouseBizcircle.one({ where: { id: data.option_bizicircle_code } });
-            const city_name = city.name ? city.name : '';
-            const county_name = county.name ? county.name : '';
-            const region_name = region.name ? region.name : '';
-            let address = city_name + county_name + region_name + data.address;
-            let gps_result = await ctx.helper.getGPS(address, city_name);
+            let addressDecode = await this.addressDecode({ city: data.option_city_code, district: data.option_district_code, bizicircle: data.option_bizicircle_code });
+            let address = addressDecode.city + addressDecode.county + addressDecode.region + data.address;
+            let gps_result = await ctx.helper.getGPS(address, addressDecode.city);
             if (!gps_result.lat || !gps_result.lng) {
-                address = city_name + county_name + region_name;
-                gps_result = await ctx.helper.getGPS(address, city_name);
+                gps_result = await ctx.helper.getGPS(addressDecode, addressDecode.city);
             }
             let longitude = 0;
             let latitude = 0;
@@ -464,6 +458,30 @@ class NewHouseService extends Service {
         return similar_list;
     }
 
+    /**
+     * 根据市区商圈的城市编码获取地址
+     * @param {*} code 
+     */
+    async addressDecode(code) {
+        const { ctx } = this;
+        let taskList = [
+            ctx.blockModel.City.one({ where: { code: code.city } }),
+            ctx.blockModel.HouseDistrict.one({ where: { id: code.district } }),
+            ctx.blockModel.HouseBizcircle.one({ where: { id: code.bizicircle } }),
+        ];
+        let retList = await Promise.all(taskList).then(result => {
+            return result;
+        }).catch(error => {
+            ctx.failed(error);
+        });
+
+        const city = retList[0].name ? retList[0].name : '';
+        const county = retList[1].name ? retList[1].name : '';
+        const region = retList[2].name ? retList[2].name : '';
+
+        return { city, county, region };
+    }
+
 }
 
 module.exports = NewHouseService;