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

app/service/house/new_house.js

@@ -15,73 +15,6 @@ const HOUSE_TYPE = [
 ]
 
 class NewHouseService extends Service {
-
-    /**
-     * 根据不同筛选获取列表
-     * @param {*} type 四种默认的按钮筛选 全部all 在售sale 最近开盘open 优惠favourable 首页home
-     */
-    async getNewHouseListByType(type) {
-        const { ctx } = this;
-        let types = ['all', 'sale', 'open', 'favourable', 'home'];
-        if (!types.includes(type)) {
-            ctx.failed('error list type');
-        }
-        let newHouseList = [];
-        let condition = {};
-        if (type === 'home') {
-            //为您推荐只展示50条在售楼盘的数据，根据排序序号取数，数字小的排在前面，数字一样的情况下根据时间逆序排列，时间也一样的情况下随机排列；
-            condition = {
-                pageSize: 50,
-                orderConditions: [{
-                    key: 'orderNum',
-                    orderSequence: 'asc',
-                },
-                {
-                    key: 'createdAt',
-                    orderSequence: 'desc',
-                },]
-            };
-        } else if (type === 'all') {
-            condition = {
-                orderConditions: [{
-                    key: 'saleType',
-                    orderSequence: 'desc',
-                },]
-            };
-        } else if (type === 'sale') {
-            //点击在售楼盘进入列表页面且只展示当前销售状态为在售的楼盘
-            condition = {
-                queryConditions: [{
-                    key: "saleType",
-                    value: '3',
-                    operator: "equal"
-                }],
-            };
-        } else if (type === 'open') {
-            //只展示最近三个月内开盘的楼盘，往前追溯三个月,列表单次加载30条楼盘数据，滑到底部再次加载30条
-            let endDate = moment().subtract(30, 'days').format('YYYY-MM-DD HH:mm:ss');
-            condition = {
-                queryConditions: [{
-                    key: "openDate",
-                    value: endDate,
-                    operator: "greater"
-                }],
-            };
-        } else if (type === 'favourable') {
-            //点击优惠好盘只展示有优惠的楼盘,列表单次加载30条楼盘数据，滑到底部再次加载30条
-            condition = {
-                queryConditions: [{
-                    key: "favourableInfo",
-                    value: false,
-                    operator: "isnull"
-                }],
-            };
-        }
-        newHouseList = await this.getNewHouseByFilter(condition);
-
-        return newHouseList;
-    }
-
     /**
      * 新房信息
      * @param {string} id 新房id
@@ -332,10 +265,10 @@ class NewHouseService extends Service {
                 operator: "equal"
             }],
             orderConditions: [
-                // {//根据楼盘在售的在前、预售的在后、售罄的在最后
-                //     key: 'saleType',
-                //     orderSequence: 'desc',
-                // }
+                {//根据楼盘在售的在前、预售的在后、售罄的在最后
+                    key: 'saleType',
+                    orderSequence: 'desc',
+                }
             ],
         }
         //是否有值来增加筛选项
@@ -410,6 +343,79 @@ class NewHouseService extends Service {
         return ret;
     }
 
+    /**
+     * 根据不同筛选获取列表
+     * @param {*} type 四种默认的按钮筛选 全部all 在售sale 最近开盘open 优惠favourable 首页home
+     */
+    async getNewHouseListByType(type) {
+        const { ctx } = this;
+        let types = ['all', 'sale', 'open', 'favourable', 'home'];
+        if (!types.includes(type)) {
+            ctx.failed('error list type');
+        }
+        let newHouseList = [];
+        let condition = {};
+        if (type === 'home') {
+            //为您推荐只展示50条在售楼盘的数据，根据排序序号取数，数字小的排在前面，数字一样的情况下根据时间逆序排列，时间也一样的情况下随机排列；
+            condition = {
+                pageSize: 50,
+                orderConditions: [{
+                    key: 'orderNum',
+                    orderSequence: 'asc',
+                }, {
+                    key: 'createdAt',
+                    orderSequence: 'desc',
+                },]
+            };
+        } else if (type === 'all') {
+            condition = {
+                orderConditions: [{
+                    key: 'saleType',
+                    orderSequence: 'desc',
+                },]
+            };
+        } else if (type === 'sale') {
+            //点击在售楼盘进入列表页面且只展示当前销售状态为在售的楼盘
+            condition = {
+                queryConditions: [{
+                    key: "saleType",
+                    value: '3',
+                    operator: "equal"
+                }],
+            };
+        } else if (type === 'open') {
+            //只展示最近三个月内开盘的楼盘，往前追溯三个月,列表单次加载30条楼盘数据，滑到底部再次加载30条
+            let endDate = moment().subtract(30, 'days').format('YYYY-MM-DD HH:mm:ss');
+            condition = {
+                queryConditions: [{
+                    key: "openDate",
+                    value: endDate,
+                    operator: "greater"
+                }],
+                orderConditions: [{
+                    key: 'saleType',
+                    orderSequence: 'desc',
+                },]
+            };
+        } else if (type === 'favourable') {
+            //点击优惠好盘只展示有优惠的楼盘,列表单次加载30条楼盘数据，滑到底部再次加载30条
+            condition = {
+                queryConditions: [{
+                    key: "favourableInfo",
+                    value: false,
+                    operator: "isnull"
+                }],
+                orderConditions: [{
+                    key: 'saleType',
+                    orderSequence: 'desc',
+                },]
+            };
+        }
+        newHouseList = await this.getNewHouseByFilter(condition);
+
+        return newHouseList;
+    }
+
     async getNewHouseByFilter(condition) {
         const { ctx, service } = this;
         let page = Number(condition.page) || 1;