add

app/service/cd/lottery_publicise.js

@@ -35,22 +35,13 @@ class LotteryPubliciseService extends Service {
         }
         let lotteryPublicise = await ctx.realestateModel.CdLotteryPublicise.findOne(filter);
         let ret = {
-            status: 0,
-            data: {
-                times: '',
-                sort: '',
-                no: '',
-                house_name: '',
-            }
+            status: lotteryPublicise ? 1 : 0,
+            times: lotteryPublicise.times || '',
+            sort: lotteryPublicise.select_order || '',
+            no: lotteryPublicise.notarization_no || '',
+            house_name: lotteryPublicise.house_name || '',
         }
         if (lotteryPublicise) {
-            ret.status = 1;
-            ret.data = {
-                times: lotteryPublicise.times,
-                sort: lotteryPublicise.select_order,
-                no: lotteryPublicise.notarization_no,
-                house_name: lotteryPublicise.house_name,
-            }
             //如果能查询到则增加查询到的id到用户查询记录表中,方便用户查看历史的时候查询
             await ctx.realestateModel.CdLotteryUserQuery.update({ publicise_id: lotteryPublicise.id }, { where: { id: add.id } });
         }
@@ -89,14 +80,31 @@ class LotteryPubliciseService extends Service {
         let ret = {
             list: []
         }
-        let query = ' SELECT aa.id query_id,aa.notarization_no no FROM (select id,notarization_no,house_name,created_at FROM cd_lottery_user_query WHERE user_id = ? AND valid = 1 ORDER BY created_at DESC) aa GROUP BY aa.house_name,aa.notarization_no DESC ORDER BY aa.created_at DESC;';
+        let query = 'SELECT aa.id,aa.notarization_no no,aa.house_name,aa.publicise_id FROM (select id,notarization_no,house_name,publicise_id,created_at FROM cd_lottery_user_query WHERE user_id = ? AND valid = 1 ORDER BY created_at DESC) aa GROUP BY aa.house_name,aa.notarization_no DESC ORDER BY aa.created_at DESC;';
         let queryFilter = {
             replacements: [ctx.userId],
             type: ctx.realestateModel.QueryTypes.SELECT,
         }
         let list = await ctx.realestateModel.query(query, queryFilter);
         if (list) {
-            ret.list = list;
+            for (let i in list) {
+                ret.list[i] = {
+                    status: list[i].publicise_id === 0 ? 0 : 1,
+                    no: list[i].no,
+                    house_name: list[i].house_name
+                }
+                if (list[i].publicise_id !== 0) {
+                    let filter = {
+                        attributes: ['times', 'select_order'],
+                        where: {
+                            id: lsit[i].publicise_id
+                        }
+                    }
+                    let lotteryPublicise = await ctx.realestateModel.CdLotteryPublicise.findOne(filter);
+                    ret.list[i].times = lotteryPublicise.times;
+                    ret.list[i].sort = lotteryPublicise.select_order;
+                }
+            }
         }
         return ret;
     }