Selaa lähdekoodia

Merge remote-tracking branch 'origin/dev' into dev

顾绍勇 5 vuotta sitten
vanhempi
commit
c570d31866

+ 38
- 7
src/main/java/com/huiju/estateagents/controller/TaHousingResourcesController.java Näytä tiedosto

@@ -4,13 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4 4
 import com.huiju.estateagents.base.BaseController;
5 5
 import com.huiju.estateagents.base.ResponseBean;
6 6
 import com.huiju.estateagents.common.CommConstant;
7
-import com.huiju.estateagents.entity.TaBuildingRoom;
8
-import com.huiju.estateagents.entity.TaHousingResources;
9
-import com.huiju.estateagents.entity.TaPreselectionRecord;
7
+import com.huiju.estateagents.entity.*;
10 8
 import com.huiju.estateagents.po.TaHousingResourcesPO;
11
-import com.huiju.estateagents.service.ITaBuildingRoomService;
12
-import com.huiju.estateagents.service.ITaHousingResourcesService;
13
-import com.huiju.estateagents.service.ITaPreselectionRecordService;
9
+import com.huiju.estateagents.service.*;
14 10
 import io.swagger.annotations.ApiOperation;
15 11
 import org.slf4j.Logger;
16 12
 import org.slf4j.LoggerFactory;
@@ -19,7 +15,9 @@ import org.springframework.web.bind.annotation.*;
19 15
 import org.springframework.web.multipart.MultipartFile;
20 16
 
21 17
 import javax.servlet.http.HttpServletRequest;
18
+import java.util.ArrayList;
22 19
 import java.util.List;
20
+import java.util.stream.Collectors;
23 21
 
24 22
 /**
25 23
  * <p>
@@ -44,6 +42,12 @@ public class TaHousingResourcesController extends BaseController {
44 42
     @Autowired
45 43
     private ITaPreselectionRecordService taPreselectionRecordService;
46 44
 
45
+    @Autowired
46
+    private ITaRaiseRecordService taRaiseRecordService;
47
+
48
+    @Autowired
49
+    private ITaRaiseHouseService taRaiseHouseService;
50
+
47 51
     /**
48 52
      * 分页查询列表
49 53
      *
@@ -225,7 +229,34 @@ public class TaHousingResourcesController extends BaseController {
225 229
                 orgId, salesBatchId, startPrice, endPrice, apartmentId);
226 230
 
227 231
         try {
228
-            responseBean.addSuccess(iTaHousingResourcesService.listHousingResources(orgId, salesBatchId, startPrice, endPrice, apartmentId, 1));
232
+            //获取所有楼房的预选热度和认筹热度
233
+            List<TaHousingResourcesPO> taHousingResourcesPOList = iTaHousingResourcesService.listHousingResources(orgId, salesBatchId, startPrice, endPrice, apartmentId, 1);
234
+            //此处处理我的预选,我的认筹,和我的锁定
235
+            //我的预选记录
236
+            QueryWrapper<TaPreselectionRecord> taPreselectionRecordQueryWrapper = new QueryWrapper<>();
237
+            taPreselectionRecordQueryWrapper.eq("org_id",orgId);
238
+            taPreselectionRecordQueryWrapper.eq("sales_batch_id",salesBatchId);
239
+            taPreselectionRecordQueryWrapper.eq("person_id",getPersonId(request));
240
+            taPreselectionRecordQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
241
+            List<TaPreselectionRecord> taPreselectionRecordList = taPreselectionRecordService.list(taPreselectionRecordQueryWrapper);
242
+            //我的认筹记录
243
+            QueryWrapper<TaRaiseRecord> taRaiseRecordQueryWrapper = new QueryWrapper<>();
244
+            taRaiseRecordQueryWrapper.eq("org_id",orgId);
245
+            taRaiseRecordQueryWrapper.eq("sales_batch_id",salesBatchId);
246
+            taRaiseRecordQueryWrapper.eq("person_id",getPersonId(request));
247
+            taRaiseRecordQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
248
+            List<TaRaiseRecord> taRaiseRecordList = taRaiseRecordService.list(taRaiseRecordQueryWrapper);
249
+            //我认筹的房源的集合
250
+            List<TaRaiseHouse> taRaiseHouseList = new ArrayList<>();
251
+            if (taRaiseRecordList.size() > 0){
252
+                //认筹记录对应的有效房源,我的锁定的房源也在里面
253
+                QueryWrapper<TaRaiseHouse> taRaiseHouseQueryWrapper = new QueryWrapper<>();
254
+                taRaiseHouseQueryWrapper.in("raise_record_id",taRaiseRecordList.stream().map(TaRaiseRecord::getRaiseRecordId).collect(Collectors.toList()));
255
+                taRaiseHouseQueryWrapper.in("person_id",getPersonId(request));
256
+                taRaiseHouseList = taRaiseHouseService.list(taRaiseHouseQueryWrapper);
257
+            }
258
+
259
+            responseBean.addSuccess(taHousingResourcesPOList);
229 260
         } catch (Exception e) {
230 261
             logger.error("listHousingResources -=- {}", e);
231 262
             responseBean.addError(e.getMessage());

+ 6
- 1
src/main/java/com/huiju/estateagents/controller/TaPreselectionController.java Näytä tiedosto

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
6 6
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
7 7
 import com.huiju.estateagents.base.BaseController;
8 8
 import com.huiju.estateagents.base.ResponseBean;
9
+import com.huiju.estateagents.common.CommConstant;
9 10
 import com.huiju.estateagents.entity.TaPersonBuilding;
10 11
 import com.huiju.estateagents.entity.TaPreselection;
11 12
 import com.huiju.estateagents.entity.TaSalesBatch;
@@ -18,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
18 19
 import org.springframework.web.bind.annotation.*;
19 20
 
20 21
 import javax.servlet.http.HttpServletRequest;
22
+import java.time.LocalDateTime;
21 23
 import java.util.List;
22 24
 
23 25
 /**
@@ -29,7 +31,7 @@ import java.util.List;
29 31
  * @since 2020-02-26
30 32
  */
31 33
 @RestController
32
-@RequestMapping("/")
34
+@RequestMapping("/api")
33 35
 public class TaPreselectionController extends BaseController {
34 36
 
35 37
     private final Logger logger = LoggerFactory.getLogger(TaPreselectionController.class);
@@ -136,6 +138,9 @@ public class TaPreselectionController extends BaseController {
136 138
             }
137 139
 
138 140
             // 新增数据
141
+            taPreselection.setOrgId(getOrgId(request));
142
+            taPreselection.setStatus(CommConstant.IS_PUBLISH);
143
+            taPreselection.setCreateDate(LocalDateTime.now());
139 144
             if (iTaPreselectionService.save(taPreselection)) {
140 145
                 responseBean.addSuccess(taPreselection);
141 146
             } else {

+ 23
- 0
src/main/java/com/huiju/estateagents/controller/TaSalesBatchController.java Näytä tiedosto

@@ -308,4 +308,27 @@ public class TaSalesBatchController extends BaseController {
308 308
         }
309 309
         return responseBean;
310 310
     }
311
+
312
+    @RequestMapping(value = "/admin/salesBatchList", method = RequestMethod.GET)
313
+    public ResponseBean salesBatchList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
314
+                                         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
315
+                                         @RequestParam(value = "salesBatchName", required = false) String salesBatchName,
316
+                                         @RequestParam(value = "buildingId", required = false) String buildingId,
317
+                                         @RequestParam(value = "status", required = false) Integer status, HttpServletRequest request) {
318
+        ResponseBean responseBean = new ResponseBean();
319
+        try {
320
+            //使用分页插件
321
+            IPage<TaSalesBatch> pg = new Page<>(pageNum, pageSize);
322
+
323
+            IPage<TaSalesBatch> result = iTaSalesBatchService.selectByCondition(pg, salesBatchName, buildingId, status, getOrgId(request), getTaPersonBuildingListByUserId(request));
324
+            List<TaSalesBatch> taSalesBatches = result.getRecords();
325
+            responseBean.addSuccess(taSalesBatches);
326
+        } catch (Exception e) {
327
+            e.printStackTrace();
328
+            logger.error("taSalesBatchList -=- {}", e.toString());
329
+            responseBean.addError(e.getMessage());
330
+        }
331
+        return responseBean;
332
+    }
333
+
311 334
 }

+ 0
- 11
src/main/java/com/huiju/estateagents/entity/TaHousingResources.java Näytä tiedosto

@@ -167,15 +167,4 @@ public class TaHousingResources implements Serializable {
167 167
 
168 168
     @TableField(exist = false)
169 169
     private List<TaHousingResources> houseIdList;
170
-
171
-
172
-    /**
173
-     * 认筹基础热度
174
-     */
175
-    private Integer raiseHeat;
176
-
177
-    /**
178
-     * 认筹实际热度
179
-     */
180
-    private Integer raiseRealHeat;
181 170
 }

+ 7
- 0
src/main/java/com/huiju/estateagents/service/impl/TaHousingResourcesServiceImpl.java Näytä tiedosto

@@ -83,6 +83,9 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
83 83
     @Autowired
84 84
     private TaBuildingPanoramaMapper taBuildingPanoramaMapper;
85 85
 
86
+    @Autowired
87
+    private TaSalesBatchMapper taSalesBatchMapper;
88
+
86 89
 
87 90
     /**
88 91
      * 分页获取房源列表
@@ -538,6 +541,10 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
538 541
             e.setBuildingId(buildingId);
539 542
             addHouseResources(e);
540 543
         });
544
+        TaSalesBatch taSalesBatch = new TaSalesBatch();
545
+        taSalesBatch.setSalesNumber(list.size());
546
+        taSalesBatch.setSalesBatchId(salesBatchId);
547
+        taSalesBatchMapper.updateById(taSalesBatch);
541 548
         return ResponseBean.success(list);
542 549
     }
543 550