Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/controller/TaHousingResourcesController.java

      */
     @ResponseBody
     @RequestMapping(value = "/admin/houseDelete/{id}", method = RequestMethod.DELETE)
-    public ResponseBean taHousingResourcesDelete(@PathVariable Integer id,HttpServletRequest request) {
+    public ResponseBean taHousingResourcesDelete(@PathVariable Integer id, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             //校验是否有预选记录
             queryWrapper.eq("org_id", getOrgId(request));
             queryWrapper.eq("house_id", id);
             List<TaPreselectionRecord> taPreselectionRecords = taPreselectionRecordService.list(queryWrapper);
-            if (taPreselectionRecords.size() > 0){
-                return ResponseBean.error("存在预选房源不能删除！",ResponseBean.ERROR_UNAVAILABLE);
+            if (taPreselectionRecords.size() > 0) {
+                return ResponseBean.error("存在预选房源不能删除！", ResponseBean.ERROR_UNAVAILABLE);
             }
             TaHousingResources taHousingResources = new TaHousingResources();
             taHousingResources.setHouseId(id);
                                              HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
-
         try {
             responseBean.addSuccess(iTaHousingResourcesService.listHousingResources(orgId, salesBatchId, startPrice, endPrice, apartmentId));
         } catch (Exception e) {
      */
     @RequestMapping(value = "/wx/getHousingDetailById", method = RequestMethod.GET)
     public ResponseBean getHousingDetailById(@RequestParam(value = "houseId") String houseId,
-                                             @RequestParam(value = "personId") String personId,
-                                             HttpServletRequest request) {
+                                             @RequestParam(value = "personId") String personId) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(iTaHousingResourcesService.getHousingDetailById(personId, houseId));
                                     HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaHousingResourcesService.getExcelData(file,salesBatchId,buildingId,getOrgId(request));
+            responseBean = iTaHousingResourcesService.getExcelData(file, salesBatchId, buildingId, getOrgId(request));
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taHousingResourcesUpdate -=- {}", e.toString());
 
     @PostMapping(value = "/admin/house/saveExcelValue", consumes = "multipart/*", headers = "content-type=multipart/form-data")
     public ResponseBean saveExcelValue(@RequestParam("file") MultipartFile file,
-                                    @RequestParam("salesBatchId") Integer salesBatchId,
-                                    @RequestParam("buildingId") String buildingId,
-                                    HttpServletRequest request) {
+                                       @RequestParam("salesBatchId") Integer salesBatchId,
+                                       @RequestParam("buildingId") String buildingId,
+                                       HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaHousingResourcesService.saveExcelValue(file,salesBatchId,buildingId,getOrgId(request));
+            responseBean = iTaHousingResourcesService.saveExcelValue(file, salesBatchId, buildingId, getOrgId(request));
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taHousingResourcesUpdate -=- {}", e.toString());

src/main/java/com/huiju/estateagents/controller/TaPreselectionRecordController.java

      * @return
      * @author gushaoyong
      */
-    @RequestMapping(value = "/taPreselectionRecord", method = RequestMethod.POST)
-    public ResponseBean taPreselectionRecordAdd(@RequestBody TaPreselectionRecord taPreselectionRecord,HttpServletRequest request) {
+    @RequestMapping(value = "/wx/taPreselectionRecord", method = RequestMethod.POST)
+    public ResponseBean taPreselectionRecordAdd(@RequestBody TaPreselectionRecord taPreselectionRecord, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
         logger.info("taPreselectionRecordAdd 接收参数，taPreselectionRecord：{}", JSONObject.toJSONString(taPreselectionRecord));
         try {
 
             // 校验参数
-            if (StringUtils.isBlank(taPreselectionRecord.getHouseId()) && StringUtils.isBlank(taPreselectionRecord.getPersonId()) &&
+            if (StringUtils.isBlank(taPreselectionRecord.getHouseId()) || StringUtils.isBlank(taPreselectionRecord.getPersonId()) ||
                 taPreselectionRecord.getOrgId() == null) {
                 logger.info("taPreselectionRecordAdd 参数错误");
                 responseBean.addError("参数错误");
                                                    @RequestParam("houseId") String houseId) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iTaPreselectionRecordService.taPreselectionRecordCancel(personId, houseId));
+            responseBean = iTaPreselectionRecordService.taPreselectionRecordCancel(personId, houseId);
         } catch (Exception e) {
             logger.error("taPreselectionRecordCancel -=- {}", e);
             responseBean.addError(e.getMessage());
                                                HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
-
         try {
             responseBean.addSuccess(iTaPreselectionRecordService.listPreselectionRecord(pageNum, pageSize, orgId, personId));
         } catch (Exception e) {

src/main/java/com/huiju/estateagents/controller/TaSalesBatchController.java

 
 /**
  * <p>
-    * 销售批次表  前端控制器
-    * </p>
+ * 销售批次表  前端控制器
+ * </p>
  *
  * @author jobob
  * @since 2020-02-10
 
     /**
      * 分页查询列表
+     *
      * @param pageNum
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/admin/taSalesBatch",method= RequestMethod.GET)
-    public ResponseBean taSalesBatchList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                         @RequestParam(value ="salesBatchName", required = false) String salesBatchName,
-                                         @RequestParam(value ="buildingId", required = false) String buildingId,
-                                         @RequestParam(value = "status", required = false) Integer status, HttpServletRequest request){
+    @RequestMapping(value = "/admin/taSalesBatch", method = RequestMethod.GET)
+    public ResponseBean taSalesBatchList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                         @RequestParam(value = "salesBatchName", required = false) String salesBatchName,
+                                         @RequestParam(value = "buildingId", required = false) String buildingId,
+                                         @RequestParam(value = "status", required = false) Integer status, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
-		    IPage<TaSalesBatch> pg = new Page<>(pageNum, pageSize);
+            IPage<TaSalesBatch> pg = new Page<>(pageNum, pageSize);
 
             IPage<TaSalesBatch> result = iTaSalesBatchService.selectByCondition(pg, salesBatchName, buildingId, status, getOrgId(request));
             responseBean.addSuccess(result);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taSalesBatchList -=- {}",e.toString());
+            logger.error("taSalesBatchList -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
 
     /**
      * 保存对象
+     *
      * @param taSalesBatch 实体对象
      * @return
      */
-    @RequestMapping(value="/admin/taSalesBatch",method= RequestMethod.POST)
-    public ResponseBean taSalesBatchAdd(@RequestBody TaSalesBatch taSalesBatch, HttpServletRequest request){
+    @RequestMapping(value = "/admin/taSalesBatch", method = RequestMethod.POST)
+    public ResponseBean taSalesBatchAdd(@RequestBody TaSalesBatch taSalesBatch, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             taSalesBatch.setOrgId(getOrgId(request));
             taSalesBatch.setCreateDate(LocalDateTime.now());
             taSalesBatch.setUpdateTime(LocalDateTime.now());
-            if (iTaSalesBatchService.save(taSalesBatch)){
+            if (iTaSalesBatchService.save(taSalesBatch)) {
                 responseBean.addSuccess(taSalesBatch);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taSalesBatchAdd -=- {}",e.toString());
+            logger.error("taSalesBatchAdd -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
 
     /**
      * 根据id删除对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/admin/taSalesBatch/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taSalesBatchDelete(@PathVariable Integer id){
+    @RequestMapping(value = "/admin/taSalesBatch/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taSalesBatchDelete(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if(iTaSalesBatchService.removeById(id)){
+            if (iTaSalesBatchService.removeById(id)) {
                 responseBean.addSuccess("success");
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taSalesBatchDelete -=- {}",e.toString());
+            logger.error("taSalesBatchDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
 
     /**
      * 修改对象
-     * @param id  实体ID
+     *
+     * @param id           实体ID
      * @param taSalesBatch 实体对象
      * @return
      */
-    @RequestMapping(value="/admin/taSalesBatch/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value = "/admin/taSalesBatch/{id}", method = RequestMethod.PUT)
     public ResponseBean taSalesBatchUpdate(@PathVariable Integer id,
-                                           @RequestBody TaSalesBatch taSalesBatch){
+                                           @RequestBody TaSalesBatch taSalesBatch) {
         ResponseBean responseBean = new ResponseBean();
         try {
             taSalesBatch.setSalesBatchId(id);
-            if (iTaSalesBatchService.updateById(taSalesBatch)){
+            if (iTaSalesBatchService.updateById(taSalesBatch)) {
                 responseBean.addSuccess(taSalesBatch);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taSalesBatchUpdate -=- {}",e.toString());
+            logger.error("taSalesBatchUpdate -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
 
     /**
      * 根据id查询对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/admin/taSalesBatch/{id}",method= RequestMethod.GET)
-    public ResponseBean taSalesBatchGet(@PathVariable Integer id){
+    @RequestMapping(value = "/admin/taSalesBatch/{id}", method = RequestMethod.GET)
+    public ResponseBean taSalesBatchGet(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(iTaSalesBatchService.getById(id));
-        }catch (Exception e){
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taSalesBatchDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象-小程序端
+     *
+     * @param id 实体ID
+     */
+    @RequestMapping(value = "/wx/taSalesBatch/{id}", method = RequestMethod.GET)
+    public ResponseBean taSalesBatchGetForMiniApp(@PathVariable Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaSalesBatchService.getById(id));
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taSalesBatchDelete -=- {}",e.toString());
+            logger.error("taSalesBatchGetForMiniApp -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;

src/main/java/com/huiju/estateagents/po/TaHousingResourcesPO.java

 
     @TableField(exist = false)
     private String termName;
+
+    /**
+     * 楼盘名称
+     */
+    private String buildingName;
 }

src/main/java/com/huiju/estateagents/service/ITaPreselectionRecordService.java

      * @param houseId  房源ID
      * @return
      */
-    Boolean taPreselectionRecordCancel(String personId, String houseId);
+    ResponseBean taPreselectionRecordCancel(String personId, String houseId);
 
     /**
      * 校验用户是否预选

src/main/java/com/huiju/estateagents/service/impl/TaHousingResourcesServiceImpl.java

                 buildingImgQueryWrapper = new QueryWrapper<>();
                 buildingImgQueryWrapper.eq("img_id", apartmentImg.getImgId());
                 buildingImgQueryWrapper.eq("img_type", CommConstant.BUILDING_IMG_APARMENT);
+                buildingImgQueryWrapper.orderByAsc("order_no");
                 taBuildingImgList = taBuildingImgMapper.selectList(buildingImgQueryWrapper);
                 apartment.setBuildingImgList(taBuildingImgList);
                 resultList.add(apartment);
             buildingImgQueryWrapper = new QueryWrapper<>();
             buildingImgQueryWrapper.eq("img_id", apartmentImg.getImgId());
             buildingImgQueryWrapper.eq("img_type", CommConstant.BUILDING_IMG_APARMENT);
+            buildingImgQueryWrapper.orderByAsc("order_no");
             taBuildingImgList = taBuildingImgMapper.selectList(buildingImgQueryWrapper);
         }
         if (CollectionUtils.isNotEmpty(taBuildingImgList)) {
                 String floorName = row.getCell(3).getStringCellValue().trim();
                 String roomName = row.getCell(4).getStringCellValue().trim();
                 BigDecimal price = BigDecimal.valueOf(row.getCell(5).getNumericCellValue());
-                Integer heat = Integer.valueOf(String.valueOf(row.getCell(6).getNumericCellValue()).substring(0,1));
+                Integer heat = Integer.valueOf(String.valueOf(row.getCell(6).getNumericCellValue()).substring(0, 1));
                 Integer status = row.getCell(7).getStringCellValue().trim().equals("是") ? 1 : 0;
 
                 int currentRow = j + 1;
 
                 QueryWrapper<TaHousingResources> taHousingResourcesQueryWrapper = new QueryWrapper<>();
 //                taHousingResourcesQueryWrapper.eq("sales_batch_id",salesBatchId);
-                taHousingResourcesQueryWrapper.eq("building_id",buildingId);
-                taHousingResourcesQueryWrapper.eq("org_id",orgId);
-                taHousingResourcesQueryWrapper.gt("status",CommConstant.STATUS_DELETE);
-                taHousingResourcesQueryWrapper.eq("term_name",termName);
-                taHousingResourcesQueryWrapper.eq("block_name",blockName);
-                taHousingResourcesQueryWrapper.eq("unit_name",unitName);
-                taHousingResourcesQueryWrapper.eq("floor_name",floorName);
-                taHousingResourcesQueryWrapper.eq("room_name",roomName);
+                taHousingResourcesQueryWrapper.eq("building_id", buildingId);
+                taHousingResourcesQueryWrapper.eq("org_id", orgId);
+                taHousingResourcesQueryWrapper.gt("status", CommConstant.STATUS_DELETE);
+                taHousingResourcesQueryWrapper.eq("term_name", termName);
+                taHousingResourcesQueryWrapper.eq("block_name", blockName);
+                taHousingResourcesQueryWrapper.eq("unit_name", unitName);
+                taHousingResourcesQueryWrapper.eq("floor_name", floorName);
+                taHousingResourcesQueryWrapper.eq("room_name", roomName);
                 TaHousingResources oldTaHouseingResources = taHousingResourcesMapper.selectOne(taHousingResourcesQueryWrapper);
-                if (null != oldTaHouseingResources){
-                    logger.info("数据库存在重复房源:{}",houseInfo);
-                    responseBean.addError("第"+ currentRow +"行与系统已录入房源"+ oldTaHouseingResources.getHouseId() +"重复");
+                if (null != oldTaHouseingResources) {
+                    logger.info("数据库存在重复房源:{}", houseInfo);
+                    responseBean.addError("第" + currentRow + "行与系统已录入房源" + oldTaHouseingResources.getHouseId() + "重复");
                     return responseBean;
                 }
 
     public ResponseBean saveExcelValue(MultipartFile file, Integer salesBatchId, String buildingId, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
         responseBean = getExcelData(file, salesBatchId, buildingId, orgId);
-        if (responseBean.getCode() != ResponseBean.CODE_SUCCESS){
+        if (responseBean.getCode() != ResponseBean.CODE_SUCCESS) {
             return responseBean;
         }
 
         //获取校验成功的数据
-        Map<String,Object> data = (Map<String,Object>)responseBean.getData();
-        List<TaHousingResources> list =  (List<TaHousingResources>)data.get("list");
+        Map<String, Object> data = (Map<String, Object>) responseBean.getData();
+        List<TaHousingResources> list = (List<TaHousingResources>) data.get("list");
         list.forEach(e -> {
             e.setOrgId(orgId);
             e.setSalesBatchId(salesBatchId);

src/main/java/com/huiju/estateagents/service/impl/TaPreselectionRecordServiceImpl.java

                     buildingImgQueryWrapper = new QueryWrapper<>();
                     buildingImgQueryWrapper.eq("img_id", apartmentImg.getImgId());
                     buildingImgQueryWrapper.eq("img_type", CommConstant.BUILDING_IMG_APARMENT);
+                    buildingImgQueryWrapper.orderByAsc("order_no");
                     taBuildingImgList = taBuildingImgMapper.selectList(buildingImgQueryWrapper);
                     po.setBuildingImgList(taBuildingImgList);
                 }
         // 校验用户是否已经预选房源
         TaPreselectionRecord record = taPreselectionRecordMapper
                 .getRecordByPersonIdAndHouseId(taPreselectionRecord.getPersonId(), taPreselectionRecord.getHouseId());
-        if (record != null) {
-            responseBean.addError("您已经预选过该房源");
+        if (record != null && 1 == record.getStatus()) {
+            responseBean.addError("已预选过此房源，请到选房记录中查看。");
             return responseBean;
         }
 
         }
 
         // 校验当前房源状态是否为已发布
-        if (!"1".equals(resourcesPO.getStatus())) {
+        if (1 != resourcesPO.getStatus()) {
             responseBean.addError("当前房源已临时取消发布，请稍后再试或联系置业顾问了解详情。");
             return responseBean;
         }
 
     @Override
     @Transactional
-    public Boolean taPreselectionRecordCancel(String personId, String houseId) {
+    public ResponseBean taPreselectionRecordCancel(String personId, String houseId) {
         logger.info("taPreselectionRecordCancel 接收参数：personId：{}，houseId：{}", personId, houseId);
 
+        ResponseBean responseBean = new ResponseBean<>();
+        // 校验是否已经取消
+        TaPreselectionRecord preselectionRecord = taPreselectionRecordMapper.getRecordByPersonIdAndHouseId(personId, houseId);
+        if (preselectionRecord != null && 1 != preselectionRecord.getStatus()) {
+            responseBean.addError("未预选过此房源，或已取消预选此房源");
+            return responseBean;
+        }
+
+        TaHousingResourcesPO resourcesPO = taHousingResourcesMapper.getHousingDetailById(houseId, "0");
+        if (resourcesPO == null || 1 != resourcesPO.getStatus()) {
+            responseBean.addError("当前房源已临时取消发布，请稍后再试或联系置业顾问了解详情。");
+            return responseBean;
+        }
+
+        // 校验当前批次状态是否为已发布
+        if (resourcesPO.getSaleBatchStatus() != 1) {
+            responseBean.addError("当前销售批次已临时取消发布，请稍后再试或联系置业顾问了解详情。");
+            return responseBean;
+        }
+
         // 更新预选记录
         TaPreselectionRecord record = new TaPreselectionRecord();
-        record.setPreselectionRecordId(Integer.parseInt(personId));
+        record.setPreselectionRecordId(preselectionRecord.getPreselectionRecordId());
         record.setStatus(0);
         record.setUpdateDate(DateUtils.today());
         updateById(record);
 
         // 更新房源表热度
-        return taHousingResourcesMapper.updateForSubtractHeat(houseId);
+        responseBean.addSuccess(taHousingResourcesMapper.updateForSubtractHeat(houseId));
+        return responseBean;
     }
 
     @Override

src/main/resources/mapper/TaHousingResourcesMapper.xml

             t2.building_area,
             t3.preselection_start_time,
             t3.preselection_end_time,
-            t3.`status` saleBatchStatus
+            t3.`status` saleBatchStatus,
+            t4.building_name buildingName
         FROM
-            ta_housing_resources t,
-            ta_building_apartment t2,
-            ta_sales_batch t3
+            ta_housing_resources t
+            LEFT JOIN ta_building_apartment t2 ON t.apartment_id = t2.apartment_id
+            LEFT JOIN ta_sales_batch t3 ON t.sales_batch_id = t3.sales_batch_id
+            LEFT JOIN ta_building t4 ON t.building_id = t4.building_id
         WHERE
-        t.house_id = #{houseId}
-        AND t.apartment_id = t2.apartment_id
-        AND t.sales_batch_id = t3.sales_batch_id
+            t.house_id = #{houseId}
         <if test="type != null and type == '1' ">
             AND t.`status` = 1
             AND t3.`status` = 1
         </if>
-        AND t2.`status` = 1
     </select>
 
     <select id="getHouseResourceList" resultType="com.huiju.estateagents.entity.TaHousingResources">