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

app/router/export20190425.js → app/router/export.js

 'use strict';
 
 module.exports = app => {
-    const router = app.router.namespace(app.config.projectRootPath + '/house/export20190425');
+    const router = app.router.namespace(app.config.projectRootPath + '/house/export');
 
     router.get('add', '/house_image', 'house.export20190425.exportHouseImages');//用户浏览记录列表
     router.get('add', '/residential', 'house.export20190425.exportResidential');//用户浏览记录列表
@@ -10,4 +10,15 @@ module.exports = app => {
     router.get('/new_house', 'house.export20190425.moveNewHouse');
     router.get('/new_house_type', 'house.export20190425.moveNewHouseType');
 
+
+    //sqlserver迁移数据
+    router.get('third', '/new_house_related', 'house.v2.export190619.moveNewHouse');
+    router.get('third', '/collection', 'house.v2.export190619.moveCollection');
+    router.get('third', '/order', 'house.v2.export190619.moveOrder');
+    router.get('third', '/history', 'house.v2.export190619.moveHistory');
+    router.get('third', '/foot', 'house.v2.export190619.moveFoot');
+
+
+
+
 };

app/service/house/v2/new_house.js

@@ -342,7 +342,7 @@ class NewHouseService extends Service {
             if (type === 'home') {
                 //为您推荐只展示50条在售楼盘的数据，根据排序序号取数，数字小的排在前面，数字一样的情况下根据时间逆序排列，时间也一样的情况下随机排列；
                 filter.limit = Number(condition.page_size) || 50;
-                filter.order.push(['order_id', 'desc'], ['created_at', 'desc']);
+                filter.order.push(['order_id', 'asc'], ['created_at', 'desc']);
             } else if (type === 'all') {
                 filter.order.push(['sale_type', 'desc']);
             } else if (type === 'sale') {