addd

app/controller/house/v2/Export190619.js

@@ -21,8 +21,9 @@ class Export20190425 extends Controller {
         }
         let newHouseList = retList.data;
         let ret = {
-            newHouse: [],
-            newHouseType: [],
+            new_org_count: newHouseList.rowCount,
+            new_house: [],
+            new_house_type: [],
         };
         if (newHouseList.rowCount > 0) {
             let list = newHouseList.results;
@@ -31,13 +32,13 @@ class Export20190425 extends Controller {
                     name: list[i].name,
                     residential_id: list[i].residentialId,
                     // developer_id: list[i].xxx,
-                    province: list[i].province,
-                    city: list[i].city,
-                    area: list[i].county,
+                    province: list[i].residential.province,
+                    city: list[i].residential.city,
+                    area: list[i].residential.county,
                     address: list[i].address,
-                    sale_province: list[i].province,
-                    sale_city: list[i].city,
-                    sale_area: list[i].county,
+                    sale_province: list[i].residential.province,
+                    sale_city: list[i].residential.city,
+                    sale_area: list[i].residential.county,
                     sale_address: list[i].saleAddress,
                     tags: list[i].tags,
                     sale_type: list[i].saleType,
@@ -89,35 +90,38 @@ class Export20190425 extends Controller {
                 }
                 //房源信息和小区信息
                 let id = await ctx.realestateModel.NewHouse.add(newHouseData);
-                ret.newHouse.push(id);
+                ret.new_house.push(id);
                 //户型
-                if (list.newHouseType.length > 0) {
-                    for (let j in list.newHouseType) {
+                if (list[i].newHouseType.length > 0) {
+                    let newHouseType = list[i].newHouseType;
+                    for (let j in newHouseType) {
                         let newHouseDataTypeData = {
-                            new_house_id: list.newHouseType[j].newHouseId,
-                            type: list.newHouseType[j].type,
-                            image: list.newHouseType[j].image,
-                            tags: list.newHouseType[j].tags,
-                            apartment: list.newHouseType[j].apartment,
-                            sale_type: list.newHouseType[j].saleType,
-                            area: list.newHouseType[j].area,
-                            orientation: list.newHouseType[j].orientation,
-                            num: list.newHouseType[j].num,
-                            price: list.newHouseType[j].price,
-                            discount: list.newHouseType[j].discount,
-                            status: Number(list.newHouseType[j].state) === 0 ? 'offline' : 'online',
-                            remark: list.newHouseType[j].remark,
+                            new_house_id: newHouseType[j].newHouseId,
+                            type: newHouseType[j].type,
+                            image: newHouseType[j].image,
+                            tags: newHouseType[j].tags,
+                            apartment: newHouseType[j].apartment,
+                            sale_type: newHouseType[j].saleType,
+                            area: newHouseType[j].area,
+                            orientation: newHouseType[j].orientation,
+                            num: newHouseType[j].num,
+                            price: newHouseType[j].price,
+                            discount: newHouseType[j].discount,
+                            status: Number(newHouseType[j].state) === 0 ? 'offline' : 'online',
+                            remark: newHouseType[j].remark,
                             valid: 1,
-                            created_at: list.newHouseType[j].created_at,
-                            updated_at: list.newHouseType[j].updated_at || null,
+                            created_at: newHouseType[j].created_at,
+                            updated_at: newHouseType[j].updated_at || null,
                             // deleted_at: list.newHouseType[j].xxx,
                         }
                         let typeId = await ctx.realestateModel.NewHouseType.add(newHouseDataTypeData);
-                        ret.newHouseType.push(typeId);
+                        ret.new_house_type.push(typeId);
                     }
                 }
             }
         }
+        ret.new_count = ret.new_house.length;
+        ret.type_count = ret.new_house_type.length;
         ctx.success(ret);
     }