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

app/controller/house/v2/Export190619.js

@@ -30,7 +30,7 @@ class Export20190425 extends Controller {
             let newHouseData = [];
             for (let i in list) {
                 newHouseData[i] = {
-                    // id: list[i].id,
+                    id: list[i].id,
                     name: list[i].name,
                     residential_id: list[i].residentialId,
                     // developer_id: list[i].xxx,
@@ -93,6 +93,7 @@ class Export20190425 extends Controller {
                     let newHouseDataTypeData = [];
                     for (let j in newHouseType) {
                         newHouseDataTypeData[j] = {
+                            id: list[i].id,
                             new_house_id: newHouseType[j].newHouseId,
                             type: newHouseType[j].type,
                             image: newHouseType[j].image,
@@ -112,12 +113,12 @@ class Export20190425 extends Controller {
                             // deleted_at: list.newHouseType[j].xxx,
                         }
                     }
-                    let type_data = await ctx.realestateModel.NewHouseType.bulkCreate(newHouseDataTypeData);
+                    let type_data = await ctx.realestateModel.NewHouseType.bulkCreate(newHouseDataTypeData, { ignoreDuplicates: true });
                     ret.type_data = ret.type_data.concat(type_data);
                 }
             }
             //房源信息和小区信息
-            let new_data = await ctx.realestateModel.NewHouse.bulkCreate(newHouseData);
+            let new_data = await ctx.realestateModel.NewHouse.bulkCreate(newHouseData, { ignoreDuplicates: true });
             ret.new_data = ret.new_data.concat(new_data);
         }
         ret.new_count = ret.new_data.length;
@@ -166,7 +167,7 @@ class Export20190425 extends Controller {
                     // deleted_at: list[i].xxx,
                 }
             }
-            let addRes = await ctx.realestateModel.Collection.bulkCreate(addData);
+            let addRes = await ctx.realestateModel.Collection.bulkCreate(addData, { ignoreDuplicates: true });
             ret.data = ret.data.concat(addRes);
         }
         ret.count = ret.data.length;
@@ -202,6 +203,7 @@ class Export20190425 extends Controller {
             let addData = [];
             for (let i in list) {
                 addData[i] = {
+                    id: list[i].id,
                     user_id: list[i].userId,
                     app_user_id: list[i].appUserId,
                     house_style: list[i].houseStyle,
@@ -216,7 +218,7 @@ class Export20190425 extends Controller {
                     // deleted_at:list[i].xxx,
                 }
             }
-            let addRes = await ctx.realestateModel.Order.bulkCreate(addData);
+            let addRes = await ctx.realestateModel.Order.bulkCreate(addData, { ignoreDuplicates: true });
             ret.data = ret.data.concat(addRes);
         }
         ret.count = ret.data.length;
@@ -253,6 +255,7 @@ class Export20190425 extends Controller {
             let addData = [];
             for (let i in list) {
                 addData[i] = {
+                    id: list[i].id,
                     user_id: list[i].userId,
                     app_user_id: list[i].appUserId,
                     key_word: list[i].keyWord,
@@ -263,7 +266,7 @@ class Export20190425 extends Controller {
                     // deleted_at: list[i].xxx,
                 }
             }
-            let addRes = await ctx.realestateModel.SearchHistory.bulkCreate(addData);
+            let addRes = await ctx.realestateModel.SearchHistory.bulkCreate(addData, { ignoreDuplicates: true });
             ret.data = ret.data.concat(addRes);
         }
         ret.count = ret.data.length;
@@ -299,6 +302,7 @@ class Export20190425 extends Controller {
             let addData = [];
             for (let i in list) {
                 addData[i] = {
+                    id: list[i].id,
                     user_id: list[i].userId,
                     // app_type_id:list[i].xxx,
                     app_user_id: list[i].appUserId,
@@ -311,7 +315,7 @@ class Export20190425 extends Controller {
                     // deleted_at: list[i].xxx,
                 }
             }
-            let addRes = await ctx.realestateModel.FootPrint.bulkCreate(addData);
+            let addRes = await ctx.realestateModel.FootPrint.bulkCreate(addData, { ignoreDuplicates: true });
             ret.data = ret.data.concat(addRes);
         }
         ret.count = ret.data.length;

app/service/house/v2/hot_question_put.js

@@ -67,15 +67,22 @@ class HotQuestionPutService extends Service {
      */
     async questionDetail(condition) {
         const { ctx } = this;
+        let ret = {
+            question: '--',
+            time: '--',
+            answerList: []
+        };
         //问题内容
         let filter = {
             attributes: ['question', 'created_at'],
             where: {
-                id: Number(condition.id),
-                status: "pass"
+                id: Number(condition.id)
             }
         }
         let question = await ctx.realestateModel.HotQuestionPut.one(filter);
+        if (question === null || !question) {
+            return ret;
+        }
         //回答的列表
         let answerFliter = {
             page: Number(condition.page) || 1,
@@ -83,9 +90,9 @@ class HotQuestionPutService extends Service {
             question_id: Number(condition.id),
         }
         let answerLsit = await ctx.service.house.v2.hotQuestionAnswer.answerList(answerFliter);
-        let ret = {
+        ret = {
             question: question.question || '',
-            time: question.created_at ? moment().format("YYYY-MM-DD") : '',
+            time: question.created_at ? moment(question.created_at).format("YYYY-MM-DD") : '',
             answerList: answerLsit
         }
         return ret;