add

app/service/cd/lottery_publicise.js

@@ -118,41 +118,28 @@ class LotteryPubliciseService extends Service {
         const { ctx } = this;
         let ret = {
             status: 0,
-            data: {
-                times: '',
-                sort: '',
-                no: '',
-                house_name: '',
-            }
+            times: '',
+            sort: '',
+            no: '',
+            house_name: '',
         }
-        let queryFilter = {
-            attributes: ['house_name', 'notarization_no', 'phone', 'publicise_id'],
+        let filter = {
+            attributes: ['house_name', 'notarization_no', 'phone'],
             where: {
                 id: id
             }
         }
-        let queryInfo = await ctx.realestateModel.CdLotteryUserQuery.findOne(queryFilter);
+        let queryInfo = await ctx.realestateModel.CdLotteryUserQuery.findOne(filter);
         if (!queryInfo) {
             return ret;
         }
-        if (queryInfo.publicise_id === 0) {
-            //如果用户以前没有查到,此处需不需要重新搜索还是说直接显示以前的结果
-            return ret;
-        }
         let publiciseFilter = {
-            where: {
-                id: queryInfo.publicise_id
-            },
+            name: queryInfo.house_name,
+            no: queryInfo.notarization_no,
+            phone: queryInfo.phone,
         }
-        let lotteryPublicise = await ctx.realestateModel.CdLotteryPublicise.findOne(publiciseFilter);
-        ret.status = 1;
-        ret.data = {
-            times: lotteryPublicise.times,
-            sort: lotteryPublicise.select_order,
-            no: lotteryPublicise.notarization_no,
-            house_name: lotteryPublicise.house_name,
-        }
-        return ret;
+        let lotteryPublicise = await this.getLotteryPublicise(publiciseFilter);
+        return lotteryPublicise;
     }