Browse Source

* 获取提示信息接口增加返参

顾绍勇 5 years ago
parent
commit
71ed380ccc

+ 10
- 7
src/main/java/com/huiju/estateagents/service/impl/TaSalesBatchServiceImpl.java View File

@@ -90,12 +90,14 @@ public class TaSalesBatchServiceImpl extends ServiceImpl<TaSalesBatchMapper, TaS
90 90
 
91 91
         Long totalHouses = null;
92 92
         BigDecimal totalRealHeat = null;
93
+        BigDecimal totalHeat = null;
93 94
 
94 95
         // 获取房源预选数量
95 96
         Map<String, Object> result = taSalesBatchMapper.getTotalHousesAndHeat(salesBatchId);
96 97
         if (result != null) {
97 98
             totalHouses = (Long) result.get("totalHouses");
98 99
             totalRealHeat = (BigDecimal) result.get("totalRealHeat");
100
+            totalHeat = (BigDecimal) result.get("totalHeat");
99 101
         }
100 102
 
101 103
         JSONObject obj = new JSONObject();
@@ -103,6 +105,7 @@ public class TaSalesBatchServiceImpl extends ServiceImpl<TaSalesBatchMapper, TaS
103 105
         obj.put("preselectionEndTime", salesBatch.getPreselectionEndTime());
104 106
         obj.put("salesNumber", totalHouses == null ? 0 : totalHouses);
105 107
         obj.put("preselectionNumber", totalRealHeat == null ? 0 : totalRealHeat);
108
+        obj.put("heatNumber", totalHeat == null ? 0 : totalHeat);
106 109
         responseBean.addSuccess(obj);
107 110
         return responseBean;
108 111
     }
@@ -126,20 +129,20 @@ public class TaSalesBatchServiceImpl extends ServiceImpl<TaSalesBatchMapper, TaS
126 129
 
127 130
         // 获取海报信息
128 131
         QueryWrapper<TaPoster> queryWrapper = new QueryWrapper<>();
129
-        queryWrapper.eq("target_id",salesBatchId + "");
130
-        queryWrapper.eq("target_type","house");
132
+        queryWrapper.eq("target_id", salesBatchId + "");
133
+        queryWrapper.eq("target_type", "house");
131 134
         queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
132
-        List<TaPoster> posterList =taPosterService.list(queryWrapper);
135
+        List<TaPoster> posterList = taPosterService.list(queryWrapper);
133 136
 
134 137
         // 获取分享内容信息
135 138
         List<TaShareContent> shareContentList = shareContentService.getPostersForTarget(salesBatchId + "", "house");
136 139
 
137 140
         List<TaPoster> resultPosterList = new ArrayList<>();
138
-        if(CollectionUtils.isNotEmpty(posterList)){
139
-            for(TaPoster poster:posterList){
141
+        if (CollectionUtils.isNotEmpty(posterList)) {
142
+            for (TaPoster poster : posterList) {
140 143
                 QueryWrapper<TdPosterTemplate> templateQueryWrapper = new QueryWrapper<>();
141
-                templateQueryWrapper.eq("status","1");
142
-                templateQueryWrapper.eq("type ","HousingChoice ");
144
+                templateQueryWrapper.eq("status", "1");
145
+                templateQueryWrapper.eq("type ", "HousingChoice ");
143 146
                 List<TdPosterTemplate> posterTemplate = tdPosterTemplateService.list(templateQueryWrapper);
144 147
 
145 148
                 poster.setTemplates(posterTemplate);

+ 2
- 1
src/main/resources/mapper/TaSalesBatchMapper.xml View File

@@ -37,7 +37,8 @@
37 37
     <select id="getTotalHousesAndHeat" resultType="java.util.Map">
38 38
         SELECT
39 39
             count( * ) totalHouses,
40
-            sum( t.real_heat ) totalRealHeat
40
+            sum( t.real_heat ) totalRealHeat,
41
+            sum( t.heat) totalHeat
41 42
         FROM
42 43
             ta_housing_resources t
43 44
         WHERE