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

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

 
             // 定位城市
             String location = null == lon ? null : lon + "," + lat;
-            TdCity tdCity = iTdCityService.getLocationCity(location, orgId, getPersonId(request));
+            TdCity tdCity = iTdCityService.getLocationCity(location, orgId, taPerson.getPersonId());
             result.put("city", tdCity);
 
             return ResponseBean.success(result);

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

         Integer orgId = getOrgId(request);
         String personId = getPersonId(request);
 
-        logger.info("TaHouseingResourcesController.listHousingResources 接收参数：orgId：{},salesBatchId：{},startPrice：{},endPrice：{},apartmentId：{}",
-                orgId, salesBatchId, startPrice, endPrice, apartmentId);
+        logger.info("TaHouseingResourcesController.listHousingResources 接收参数：orgId：{},salesBatchId：{},startPrice：{},endPrice：{},apartmentId：{},source:{}",
+                orgId, salesBatchId, startPrice, endPrice, apartmentId, source);
 
         try {
             //获取所有楼房的预选热度和认筹热度
      * @return
      */
     @RequestMapping(value = "/admin/house/updateLockingStatus", method = RequestMethod.PUT)
-    public ResponseBean updateLockingStatus(Integer houseId, String type, Integer raiseHouseId, String personId,Integer raiseRecordId,
+    public ResponseBean updateLockingStatus(Integer houseId, String type, Integer raiseHouseId, String personId, Integer raiseRecordId,
                                             HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
         }
         return responseBean;
     }
+
+    /**
+     * 校验房源认筹状态
+     *
+     * @return
+     */
+    @RequestMapping(value = "/wx/check/raise", method = RequestMethod.GET)
+    public ResponseBean checkRaise(@RequestParam(value = "houseIds") String houseIds,HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            boolean state = iTaHousingResourcesService.checkRaiseState(houseIds,getPersonId(request),getOrgId(request));
+            responseBean.addSuccess(state);
+        } catch (Exception e) {
+            logger.error("校验房源状态 -=- {}", e.getMessage());
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_MISSING_PARAMS);
+        }
+        return responseBean;
+    }
 }

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

                     return responseBean;
                 }
                 if (!CommConstant.PAY_STATUS_UNPAID.equals(tr.getPayStatus())) {
-                    responseBean.addError(String.format("认筹单编号为%s的记录已缴费或意图款，请重新选择", record.getRaiseRecordId()));
+                    responseBean.addError(String.format("认筹单编号为%s的记录为未缴费状态 ，请重新选择", record.getRaiseRecordId()));
                     return responseBean;
                 }
             }
             responseBean.addSuccess(iTaRaiseRecordService.saveRaiseInfo(taRaiseRecord, getOrgId(request), getPersonId(request)));
         } catch (Exception e) {
             logger.error("微信端下认筹单 -=- {}", e.toString());
-            responseBean.addError(e.getMessage());
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_MISSING_PARAMS);
         }
         return responseBean;
     }

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

      */
     @TableField(exist = false)
     private Integer raiseRecordId;
+
+    /**
+     * 是否展示房源价格
+     */
+    @TableField(exist = false)
+    private Boolean displayHousePrice;
 }

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

      */
     @TableField(exist = false)
     private TaHousingResources housingInfo;
+
+    /**
+     * 是否展示房源价格
+     */
+    @TableField(exist = false)
+    private Boolean displayHousePrice;
 }

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

      * @return
      */
     ResponseBean updateLockingStatus(Integer houseId, String type, Integer orgId, Integer raiseHouseId, String personId, Integer raiseRecordId);
+
+    /**
+     * 校验房源的认筹状态
+     * @param houseIds
+     * @param personId
+     * @param orgId
+     * @return
+     */
+    boolean checkRaiseState(String houseIds, String personId, Integer orgId) throws Exception;
 }

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

         if (null == taRaise) {
             resourcesPO.setRaiseBtn(false);
         } else {
-            //有认筹表的情况下判断是否认筹过这个房源
-            boolean raiseBtnStatus = checkRaiseBtn(taRaise, salesBatchId, personId, houseId, orgId);
             resourcesPO.setTaRaise(taRaise);
         }
 
         return resourcesPO;
     }
 
-    /**
-     * 校验认筹状态的按钮
-     *
-     * @param taRaise
-     * @param salesBatchId
-     * @param personId
-     * @param houseId
-     * @param orgId
-     * @return
-     */
-    private boolean checkRaiseBtn(TaRaise taRaise, Integer salesBatchId, String personId, Integer houseId, Integer orgId) {
-        if (taRaise.getStatus() != CommConstant.STATUS_NORMAL) {
-            return false;
-        }
-        if (taRaise.getNeedPreselection()) {
-            //查看是否有当前房源的预选记录
-            QueryWrapper<TaPreselectionRecord> preselectionRecordQueryWrapper = new QueryWrapper<>();
-            preselectionRecordQueryWrapper.eq("sales_batch_id", salesBatchId);
-            preselectionRecordQueryWrapper.eq("building_id", taRaise.getBuildingId());
-            preselectionRecordQueryWrapper.eq("org_id", orgId);
-            preselectionRecordQueryWrapper.eq("house_id", houseId);
-            preselectionRecordQueryWrapper.eq("person_id", personId);
-            TaPreselectionRecord taPreselectionRecord = taPreselectionRecordMapper.selectOne(preselectionRecordQueryWrapper);
-            if (null == taPreselectionRecord) {
-                return false;
-            }
-        }
-        //判断是否在时间之内
-
-        LocalDateTime raiseStartTime = taRaise.getRaiseStartTime();
-        LocalDateTime raiseEndTime = taRaise.getRaiseEndTime();
-        LocalDateTime now = LocalDateTime.now();
-        if (now.isBefore(raiseStartTime) || now.isAfter(raiseEndTime)) {
-            return false;
-        }
-        //销售批次校验
-        TaSalesBatch taSalesBatch = taSalesBatchMapper.selectById(salesBatchId);
-        if (taSalesBatch.getStatus() != CommConstant.STATUS_NORMAL) {
-            return false;
-        }
-
-        //房源信息
-        TaHousingResources taHousingResources = taHousingResourcesMapper.selectById(houseId);
-        if (taHousingResources.getStatus() != CommConstant.STATUS_NORMAL || CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(taHousingResources.getHouseLockingStatus())) {
-            return false;
-        }
-
-        //查询我的认筹记录表
-        QueryWrapper<TaRaiseHouse> taRaiseHouseQueryWrapper = new QueryWrapper<>();
-        taRaiseHouseQueryWrapper.eq("org_id", orgId);
-        taRaiseHouseQueryWrapper.eq("house_id", houseId);
-        taRaiseHouseQueryWrapper.eq("person_id", personId);
-        List<TaRaiseHouse> list = taRaiseHouseService.list(taRaiseHouseQueryWrapper);
-        if (list.size() > 0) {
-            return false;
-        }
-
-        return true;
-    }
-
     /**
      * 校验楼栋信息存不存在
      *
         return responseBean;
     }
 
+    /**
+     * 校验房源的认筹状态
+     *
+     * @param houseIds
+     * @param personId
+     * @param orgId
+     * @return
+     */
+    @Override
+    public boolean checkRaiseState(String houseIds, String personId, Integer orgId) throws Exception {
+        String[] houseIdArr = houseIds.split(",");
+        //房源信息
+        TaHousingResources taHousingResources = taHousingResourcesMapper.selectById(houseIdArr[0]);
+        //通过销售批次信息获取认筹信息
+        QueryWrapper<TaRaise> taRaiseQueryWrapper = new QueryWrapper<>();
+        taRaiseQueryWrapper.eq("org_id",orgId);
+        taRaiseQueryWrapper.eq("sales_batch_id",taHousingResources.getSalesBatchId());
+        taRaiseQueryWrapper.eq("building_id",taHousingResources.getBuildingId());
+        TaRaise taRaise = taRaiseMapper.selectOne(taRaiseQueryWrapper);
+        if (taRaise.getStatus() != CommConstant.STATUS_NORMAL) {
+            throw new Exception("认筹单已经作废");
+        }
+        //校验房源是否同一批次
+        for (String houseId : houseIdArr){
+            TaHousingResources taHousingResourcesChecked = taHousingResourcesMapper.selectById(houseId);
+            if (taHousingResources.getSalesBatchId() != taHousingResourcesChecked.getSalesBatchId()){
+                throw new Exception("非同一批次房源");
+            }
+            if (taRaise.getNeedPreselection()) {
+                //查看是否有当前房源的预选记录
+                QueryWrapper<TaPreselectionRecord> preselectionRecordQueryWrapper = new QueryWrapper<>();
+                preselectionRecordQueryWrapper.eq("sales_batch_id", taRaise.getSalesBatchId());
+                preselectionRecordQueryWrapper.eq("building_id", taRaise.getBuildingId());
+                preselectionRecordQueryWrapper.eq("org_id", orgId);
+                preselectionRecordQueryWrapper.eq("house_id", houseId);
+                preselectionRecordQueryWrapper.eq("person_id", personId);
+                TaPreselectionRecord taPreselectionRecord = taPreselectionRecordMapper.selectOne(preselectionRecordQueryWrapper);
+                if (null == taPreselectionRecord) {
+                    throw new Exception("需要先预选才能认筹");
+                }
+            }
+            //查询我的认筹记录表
+            QueryWrapper<TaRaiseHouse> taRaiseHouseQueryWrapper = new QueryWrapper<>();
+            taRaiseHouseQueryWrapper.eq("org_id", orgId);
+            taRaiseHouseQueryWrapper.eq("house_id", houseId);
+            taRaiseHouseQueryWrapper.eq("person_id", personId);
+            List<TaRaiseHouse> list = taRaiseHouseService.list(taRaiseHouseQueryWrapper);
+            if (list.size() > 0) {
+                throw new Exception("您已有认筹单包含当前房源");
+            }
+
+        }
+        if (taHousingResources.getStatus() != CommConstant.STATUS_NORMAL) {
+            throw new Exception("房源已被取消发布");
+        }
+        if (CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(taHousingResources.getHouseLockingStatus())){
+            throw new Exception("房源已被其他客户锁定");
+        }
+        //销售批次信息
+        TaSalesBatch taSalesBatch = taSalesBatchMapper.selectById(taHousingResources.getSalesBatchId());
+        //销售批次校验
+        if (null == taSalesBatch) {
+            throw new Exception("无销售批次无法认筹");
+        }
+        if (taSalesBatch.getStatus() != CommConstant.STATUS_NORMAL) {
+            throw new Exception("销售批次已被取消发布");
+        }
+
+        //判断是否在时间之内
+        LocalDateTime raiseStartTime = taRaise.getRaiseStartTime();
+        LocalDateTime raiseEndTime = taRaise.getRaiseEndTime();
+        LocalDateTime now = LocalDateTime.now();
+        if (now.isBefore(raiseStartTime) || now.isAfter(raiseEndTime)) {
+            throw new Exception("不在认筹时间内");
+        }
+
+        return true;
+    }
+
     //更新房号
     private void updateRoom(TaHousingResources taHousingResources) {
         TaBuildingRoom taBuildingRoom = new TaBuildingRoom();

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

         if (jsonObject.getString("status").equals("1")) {
             JSONObject addressComponent = jsonObject.getJSONObject("regeocode").getJSONObject("addressComponent");
             String citycode = addressComponent.getString("citycode");
-            QueryWrapper<TdCity> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("citycode", citycode);
-            queryWrapper.eq("leveltype", 2);
-            List<TdCity> tdCities = tdCityMapper.selectList(queryWrapper);
-            if (tdCities.size() > 0) {
-                List<TdCity> cityList = selectWxCity(null, orgId);
-                Integer cityId = tdCities.get(0).getId();
-                for (TdCity tdCity : cityList) {
-                    if (tdCity.getId().equals(cityId)) {
-                        return tdCity;
-                    }
-                }
-            }
-//            return null;
-
             // 保存用户位置信息
             if (StringUtils.isNotBlank(personId)) {
                 ExecutorService threadPool = Executors.newCachedThreadPool();
                 threadPool.execute(() -> {
+                    logger.info("保存用户位置信息开始");
                     TaPersonPositon record = new TaPersonPositon();
                     try {
                         String[] locationArr = location.split(",");
                 });
             }
 
+            QueryWrapper<TdCity> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("citycode", citycode);
+            queryWrapper.eq("leveltype", 2);
+            List<TdCity> tdCities = tdCityMapper.selectList(queryWrapper);
+            if (tdCities.size() > 0) {
+                List<TdCity> cityList = selectWxCity(null, orgId);
+                Integer cityId = tdCities.get(0).getId();
+                for (TdCity tdCity : cityList) {
+                    if (tdCity.getId().equals(cityId)) {
+                        return tdCity;
+                    }
+                }
+            }
+//            return null;
         }
 
         // 没有匹配到则返回默认城市

src/main/resources/mapper/TaHousingResourcesMapper.xml

         FROM
         (
         SELECT
-        t.house_id,
+        t.*,
         (
         CASE
         WHEN ( SELECT num_char_extract ( t.term_name, 2 ) + 0 ) = 0 THEN
         ( SELECT num_char_extract ( t.unit_name, 2 ) ) ELSE ( SELECT num_char_extract ( t.unit_name, 2 ) + 0 )
         END
         ) unitNamePre,
-        t.building_id,
-        t.block_id,
-        t.block_name,
-        t.sales_batch_id,
-        t.unit_id,
-        t.unit_name,
-        t.floor_id,
-        t.floor_name,
-        t.room_id,
-        t.room_name,
-        t.price,
-        t.heat,
-        t.real_heat,
-        t.apartment_id,
-        t.`status`,
-        t.org_id,
         t2.inside_area,
         t2.building_area,
-        t2.apartment_name,
-        t3.term_id,
-        t.term_name,
-        t.raise_heat,
-        t.raise_real_heat,
-        t.house_locking_status
+        t2.apartment_name
         FROM
         ta_housing_resources t
         LEFT JOIN ta_building_apartment t2 ON t.apartment_id = t2.apartment_id
-        LEFT JOIN ta_building_block t3 ON t.block_id = t3.block_id
         LEFT JOIN ta_sales_batch t4 ON t.sales_batch_id = t4.sales_batch_id
         <if test="source == 'raiseChoose'">
             LEFT JOIN ta_raise_house t5 ON t.house_id = t5.house_id
             LEFT JOIN ta_raise_record t6 ON t6.raise_record_id = t5.raise_record_id
+            LEFT JOIN ta_raise t7 ON t.sales_batch_id = t7.sales_batch_id
         </if>
         WHERE
-        t.sales_batch_id = #{salesBatchId}
-        AND t.org_id = #{orgId}
-        AND t.`status` > 0
-        AND t4.`status` = 1
+            t.sales_batch_id = #{salesBatchId}
+            AND t.org_id = #{orgId}
+            AND t.`status` > 0
+            AND t4.`status` = 1
         <if test = "source == 'raiseChoose'">
             AND ( t6.`status` != 0 OR t6.`status` IS NULL )
+            AND (t.house_locking_status  != 'locked' OR t.house_locking_status IS NULL)
+            AND t7.raise_start_time &lt;= now( ) AND t7.raise_end_time &gt;= now()
             <if test="personId != null and personId != ''">
-                AND t6.person_id != #{personId}
+                AND (t6.person_id != #{personId} OR t6.person_id IS NULL)
             </if>
-            AND (t.house_locking_status  != 'locked'
-            OR t.house_locking_status IS NULL)
         </if>
         <choose>
             <when test=" endPrice != null and startPrice == null">
             AND t.apartment_id = #{apartmentId}
         </if>
         ) t5
+        GROUP BY
+        t5.house_id
         ORDER BY
         t5.termNamePre,
         t5.blockNamePre,

src/main/resources/mapper/TaPreselectionRecordMapper.xml

             t2.apartment_id,
             t2.building_id buildingId,
             t2.`status` housingStatus,
-            t3.`status` saleBatchStatus
+            t3.`status` saleBatchStatus,
+            t3.display_house_price
         FROM
             ta_preselection_record t
         LEFT JOIN ta_housing_resources t2 ON t.house_id = t2.house_id