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

app/controller/house/v2/Export190619.js

@@ -307,7 +307,7 @@ class Export20190425 extends Controller {
                     user_id: list[i].userId,
                     // app_type_id:list[i].xxx,
                     app_user_id: list[i].appUserId,
-                    house_style: list[i].xxx,
+                    house_style: list[i].houseStyle,
                     connect_id: list[i].connectId,
                     state: list[i].state,
                     remark: list[i].remark,

app/service/house/v2/collection.js

@@ -182,7 +182,7 @@ class CollectionService extends Service {
             },
             order: [['id', 'desc']]
         }
-        let list = await ctx.realestateModel.Collection.all(filter);
+        let list = await ctx.realestateModel.Collection.findAll(filter);
         let count = 0;
         if (list.length > 0) {
             let newHouseId = [];

app/service/house/v2/foot_print.js

@@ -132,41 +132,32 @@ class FootPrintService extends Service {
             },
             order: [['created_at', 'desc']]
         }
-        const list = await ctx.realestateModel.FootPrint.all(filter);
+        const list = await ctx.realestateModel.FootPrint.findAll(filter);
         let count = 0;
         if (list.length > 0) {
-            let newHouseId = [];
-            let rentalHouseId = [];
+            let taskList = [];
             for (let i in list) {
+                let taskFilter = {
+                    attributes: ['id'],
+                    where: {
+                        status: 'online',
+                        valid: 1,
+                        id: list[i].connect_id
+                    }
+                }
                 if (Number(list[i].house_style) === 1) {
-                    newHouseId.push(list[i].connect_id);
+                    taskList[i] = ctx.realestateModel.NewHouse.one(taskFilter);
                 }
                 if (Number(list[i].house_style) === 2) {
-                    rentalHouseId.push(list[i].connect_id);
+                    taskList[i] = ctx.realestateModel.RentalHouse.one(taskFilter);
                 }
             }
-            let newHousefilter = {
-                where: {
-                    status: 'online',
-                    valid: 1,
-                    id: { $in: newHouseId },
-                },
-            }
-            let newHouseCountTask = ctx.realestateModel.NewHouse.count(newHousefilter);
-            let rentalHousefilter = {
-                where: {
-                    status: 'online',
-                    valid: 1,
-                    id: { $in: rentalHouseId },
-                },
-            }
-            let rentalHouseCountTask = ctx.realestateModel.RentalHouse.count(rentalHousefilter);
-            const retList = await Promise.all([newHouseCountTask, rentalHouseCountTask]).then(result => {
+            const retList = await Promise.all(taskList).then(result => {
                 return result;
             }).catch(error => {
                 ctx.failed(error);
             });
-            count = Number(retList[0]) + Number(retList[1]);
+            count = Number(retList.length);
         }
         let ret = {
             count: count

app/service/house/v2/order.js

@@ -136,7 +136,7 @@ class OrderService extends Service {
             },
             order: [['id', 'desc']]
         }
-        let list = await ctx.realestateModel.Order.all(filter);
+        let list = await ctx.realestateModel.Order.findAll(filter);
         let count = 0;
         if (list.length > 0) {
             let newHouseId = [];