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

src/main/java/com/huiju/estateagents/bo/request/RaiseOrderRequestBO.java

      * 结束时间
      */
     private String payEndTime;
+
+    /**
+     * 微信订单号
+     */
+    private String tradeNo;
 }

src/main/java/com/huiju/estateagents/common/CommConstant.java

      * 菜单
      */
     public static final Object ADVANCED_TYPE_MENU = "menu";
+
+    /**
+     * 线下缴费
+     */
+    public static final String PAY_TYPE_OFFLINE = "offLine";
 }

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,
+    public ResponseBean updateLockingStatus(Integer houseId, String type, Integer raiseHouseId, String personId, Integer raiseRecordId,
                                             HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaHousingResourcesService.updateLockingStatus(houseId, type, getOrgId(request), raiseHouseId, personId);
+            responseBean = iTaHousingResourcesService.updateLockingStatus(houseId, type, getOrgId(request), raiseHouseId, personId, raiseRecordId);
             logger.info("updateLockingStatus 返回结果：", JSONObject.toJSONString(responseBean));
         } catch (Exception e) {
             logger.error("updateLockingStatus 异常：", e);
         }
         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/TaRaiseHouseController.java

      * @return
      */
     @RequestMapping(value = "/admin/taRaiseHouse", method = RequestMethod.POST)
-    public ResponseBean taRaiseHouseAdd(TaRaiseHouse taRaiseHouse, HttpServletRequest request) {
+    public ResponseBean taRaiseHouseAdd(@RequestBody TaRaiseHouse taRaiseHouse, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
 
             // 校验参数
-            if (taRaiseHouse.getRaiseRecordId() != null) {
+            if (taRaiseHouse.getRaiseRecordId() == null) {
                 responseBean.addError("参数错误");
                 return responseBean;
             }

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

                 iTaRaiseRecordService.updateForSubtractRaiseHeat(record.getRaiseRecordId());
 
                 //发送订阅消息
-                iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(),record.getRaiseId(),"在线选房认筹通知","认筹单已作废","点击详情查看认筹单","具体原因查看详情",false);
+                iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(),record.getRaiseId(),"认筹通知","认筹单已作废","点击详情查看认筹单","具体原因查看详情",false);
             });
 
             if (iTaRaiseRecordService.updateBatchById(raiseRecord.getTaRaiseRecords())) {
                 iTaRaiseRecordService.updateForSubtractRaiseHeat(record.getRaiseRecordId());
 
                 //发送订阅消息
-                iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(),record.getRaiseId(),"在线选房认筹通知","认筹单已作废","点击详情查看认筹单","具体原因查看详情",false);
+                iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(),record.getRaiseId(),"认筹通知","认筹单已作废","点击详情查看认筹单","具体原因查看详情",false);
             });
 
             if (iTaRaiseRecordService.updateBatchById(raiseRecord.getTaRaiseRecords())) {
                     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;
                 }
             }
                 record.setPayStatus(CommConstant.PAY_STATUS_PAID);
                 record.setUpdateDate(LocalDateTime.now());
                 //发送订阅消息
-                iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(),record.getRaiseId(),"在线选房认筹通知","认筹已缴费","点击详情查看认筹单","您的认筹已成功缴费",false);
+                iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(),record.getRaiseId(),"认筹通知","认筹已缴费","点击详情查看认筹单","您的认筹已成功缴费",false);
             });
 
             if (iTaRaiseRecordService.updateBatchById(raiseRecord.getTaRaiseRecords())) {
                 record.setRefundReason(raiseRecord.getRefundReason());
                 record.setUpdateDate(LocalDateTime.now());
                 //发送订阅消息
-                iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(),record.getRaiseId(),"在线选房认筹通知","认筹已退费","点击详情查看认筹单","您的认筹已成功退费",false);
+                iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(),record.getRaiseId(),"认筹通知","认筹已退费","点击详情查看认筹单","您的认筹已成功退费",false);
             });
 
             if (iTaRaiseRecordService.updateBatchById(raiseRecord.getTaRaiseRecords())) {
             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;
     }
         }
         return responseBean;
     }
+
+    /**
+     * 微信端客户选择线下缴费就需要把此人的认筹单的缴费状态改为线下缴费
+     *
+     */
+    @RequestMapping(value = "/wx/taRaiseRecord/{raiseRecordId}", method = RequestMethod.PUT)
+    public ResponseBean taRaiseRecordUpdate(@PathVariable Integer raiseRecordId,
+                                            HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            TaRaiseRecord taRaiseRecord = new TaRaiseRecord();
+            taRaiseRecord.setRaiseRecordId(raiseRecordId);
+            taRaiseRecord.setPayType(CommConstant.PAY_TYPE_OFFLINE);
+            if (iTaRaiseRecordService.updateById(taRaiseRecord)) {
+                responseBean.addSuccess(taRaiseRecord);
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taRaiseRecordUpdate -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        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

      * @param personId
      * @return
      */
-    ResponseBean updateLockingStatus(Integer houseId, String type, Integer orgId, Integer raiseHouseId, String personId);
+    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

     @Autowired
     private TaRaiseMapper taRaiseMapper;
 
+    @Autowired
+    private TaRaiseRecordMapper taRaiseRecordMapper;
+
     /**
      * 分页获取房源列表
      *
         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;
-    }
-
     /**
      * 校验楼栋信息存不存在
      *
     }
 
     @Override
-    public ResponseBean updateLockingStatus(Integer houseId, String type, Integer orgId, Integer raiseHouseId, String personId) {
+    public ResponseBean updateLockingStatus(Integer houseId, String type, Integer orgId, Integer raiseHouseId, String personId, Integer raiseRecordId) {
         logger.info("updateLockingStatus 接收参数：houseId:{},type:{},orgId:{},raiseHouseId:{},personId:{}",
                 houseId, type, orgId, raiseHouseId, personId);
         ResponseBean responseBean = new ResponseBean();
             return responseBean;
         }
 
-        QueryWrapper<TaPerson> personQueryWrapper = new QueryWrapper<>();
-        personQueryWrapper.eq("person_id", personId);
-        TaPerson person = taPersonService.getOne(personQueryWrapper);
-        if (person == null) {
-            logger.info("updateLockingStatus 用户未找到");
-            responseBean.addError("fail");
-            return responseBean;
-        }
+        QueryWrapper<TaRaiseHouse> taRaiseHouseQueryWrapper = new QueryWrapper<>();
+        taRaiseHouseQueryWrapper.eq("raise_record_id", raiseRecordId);
+        taRaiseHouseQueryWrapper.eq("raise_house_id", raiseHouseId);
+        TaRaiseHouse taRaiseHouse = taRaiseHouseService.getOne(taRaiseHouseQueryWrapper);
+
+        QueryWrapper<TaRaiseRecord> taRaiseRecordQueryWrapper = new QueryWrapper<>();
+        taRaiseRecordQueryWrapper.eq("raise_record_id", raiseRecordId);
+        TaRaiseRecord raiseRecord = taRaiseRecordMapper.selectOne(taRaiseRecordQueryWrapper);
 
         // 更新为锁定状态
-        if ("lock".equals(type)) {
+        if ("locked".equals(type)) {
+                // 校验当前房源状态
+                if ("locked".equals(po.getHouseLockingStatus())){
+                    responseBean.addError("房源已被锁定");
+                    return responseBean;
+                }
 
-            // 校验当前房源状态
-            if (!"locked".equals(po.getHouseLockingStatus())) {
-                // 更行房源表状态
                 TaHousingResources housingResources = new TaHousingResources();
                 housingResources.setHouseId(po.getHouseId());
                 housingResources.setHouseLockingStatus("locked");
-                housingResources.setHouseLockingPerson(personId);
-                housingResources.setUpdateUser(person.getUserId());
+                housingResources.setHouseLockingPerson(taRaiseHouse.getPersonId());
                 housingResources.setUpdateDate(LocalDateTime.now());
+                housingResources.setHouseLockingPerson(raiseRecord.getPersonId());
                 updateById(housingResources);
 
+                //更新认筹单房源锁定状态
+                TaRaiseRecord taRaiseRecord = new TaRaiseRecord();
+                taRaiseRecord.setRaiseRecordId(raiseRecordId);
+                taRaiseRecord.setHouseLockingStatus("locked");
+                taRaiseRecordMapper.updateById(taRaiseRecord);
+
                 // 更新关联表状态
                 TaRaiseHouse raiseHouse = new TaRaiseHouse();
                 raiseHouse.setRaiseHouseId(raiseHouseId);
                 raiseHouse.setHouseLockingStatus("locked");
-                raiseHouse.setPersonId(personId);
-                raiseHouse.setPersonName(person.getName());
                 responseBean.addSuccess(taRaiseHouseService.updateById(raiseHouse));
                 return responseBean;
-            }
-            responseBean.addError("当前房源已为锁定状态");
-            return responseBean;
         }
 
         // 更新为解锁状态
-        if ("unlock".equals(type)) {
+        if ("unlocked".equals(type)) {
+                // 校验当前房源状态
+                if ("unlocked".equals(po.getHouseLockingStatus())){
+                    responseBean.addError("房源已被解锁");
+                    return responseBean;
+                }
 
-            // 校验当前房源状态
-            if ("locked".equals(po.getHouseLockingStatus())) {
-                // 更新房源表状态
                 TaHousingResources housingResources = new TaHousingResources();
                 housingResources.setHouseId(po.getHouseId());
                 housingResources.setHouseLockingStatus("unlocked");
                 housingResources.setHouseLockingPerson("");
-                housingResources.setUpdateUser(person.getUserId());
                 housingResources.setUpdateDate(LocalDateTime.now());
                 updateById(housingResources);
 
+                //更新认筹单房源锁定状态
+                TaRaiseRecord taRaiseRecord = new TaRaiseRecord();
+                taRaiseRecord.setRaiseRecordId(raiseRecordId);
+                taRaiseRecord.setHouseLockingStatus("unlocked");
+                taRaiseRecordMapper.updateById(taRaiseRecord);
+
                 // 更新关联表状态
                 TaRaiseHouse raiseHouse = new TaRaiseHouse();
                 raiseHouse.setRaiseHouseId(raiseHouseId);
                 raiseHouse.setPersonName("");
                 responseBean.addSuccess(taRaiseHouseService.updateById(raiseHouse));
                 return responseBean;
-            }
-            responseBean.addError("当前房源已为解锁状态");
-            return responseBean;
         }
         responseBean.addError("fail");
         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/TaRaiseRecordServiceImpl.java

         saveRaiseRecord(taRaiseRecord, orgId, personId, taRaise);
 
         //发送订阅消息
-        sendRaiseMsg(taRaiseRecord.getRaiseRecordId(), personId, "在线选房认筹通知", "已提交认筹", "点击详情查看认筹单", "房源紧俏，请赶紧缴费", true);
+        sendRaiseMsg(taRaiseRecord.getRaiseRecordId(), personId, "认筹通知", "已提交认筹", "点击详情查看认筹单", "房源紧俏，请赶紧缴费", true);
 
         return taRaiseRecord;
     }

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/java/com/huiju/estateagents/service/impl/WxPayServiceImpl.java

                 e.setPayTime(LocalDateTime.now());
                 if (orderInfo.get("refund_status").equals(WXPayConstants.SUCCESS)){
                     //发送订阅消息
-                    taRaiseRecordService.sendRaiseMsg(taRaiseRecord.getRaiseRecordId(),taRaiseRecord.getPersonId(),"在线选房认筹通知","线上退费成功","点击详情查看认筹单","线上退费成功",false);
+                    taRaiseRecordService.sendRaiseMsg(taRaiseRecord.getRaiseRecordId(),taRaiseRecord.getPersonId(),"认筹通知","线上退费成功","点击详情查看认筹单","线上退费成功",false);
                 }
                 if (!orderInfo.get("refund_status").equals(WXPayConstants.SUCCESS)){
                     //发送订阅消息
-                    taRaiseRecordService.sendRaiseMsg(taRaiseRecord.getRaiseRecordId(),taRaiseRecord.getPersonId(),"在线选房认筹通知","线上退费失败","点击详情查看认筹单","请联系置业顾问",false);
+                    taRaiseRecordService.sendRaiseMsg(taRaiseRecord.getRaiseRecordId(),taRaiseRecord.getPersonId(),"认筹通知","线上退费失败","点击详情查看认筹单","请联系置业顾问",false);
                 }
             }
             taOrderMapper.updateById(e);
         taRaiseRecord.setRefundReason(taOrder.getRefundReason());
         taRaiseRecordMapper.updateById(taRaiseRecord);
         //发送订阅消息
-        taRaiseRecordService.sendRaiseMsg(taRaiseRecord.getRaiseRecordId(),taRaiseRecord.getRaiseId(),"在线选房认筹通知","认筹正在退费","点击详情查看认筹单","正在等待微信或银行到账",false);
+        taRaiseRecordService.sendRaiseMsg(taRaiseRecord.getRaiseRecordId(),taRaiseRecord.getRaiseId(),"认筹通知","认筹正在退费","点击详情查看认筹单","正在等待微信或银行到账",false);
     }
 
     /**
         taRaiseRecordMapper.updateById(taRaiseRecord);
 
         //发送订阅消息
-        taRaiseRecordService.sendRaiseMsg(taRaiseRecord.getRaiseRecordId(),taRaiseRecord.getRaiseId(),"在线选房认筹通知","认筹支付成功","点击详情查看认筹单","已付款成功",false);
+        taRaiseRecordService.sendRaiseMsg(taRaiseRecord.getRaiseRecordId(),taRaiseRecord.getRaiseId(),"认筹通知","认筹支付成功","点击详情查看认筹单","已付款成功",false);
     }
 
     /**

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,
     <update id="batchUpdateRaiseHeat">
         UPDATE ta_housing_resources t
         SET t.raise_heat = #{raiseHeat},
-        t.update_user = #{updateUser}
+        t.update_user = #{updateUser},
+        t.update_date =now()
         WHERE
         t.org_id = #{orgId}
         AND t.sales_batch_id = #{salesBatchId}
     <update id="batchUpdateHeat">
         UPDATE ta_housing_resources t
         SET t.heat = #{heat},
-        t.update_user = #{updateUser}
+        t.update_user = #{updateUser},
+        t.update_date =now()
         WHERE
         t.org_id = #{orgId}
         AND t.sales_batch_id = #{salesBatchId}

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

src/main/resources/mapper/TaRaiseRecordMapper.xml

             <if test = "bo.transactionId != null and bo.transactionId != ''">
                 AND t2.transaction_id = #{bo.transactionId}
             </if>
+            <if test = "bo.tradeNo != null and bo.tradeNo != ''">
+                AND t2.trade_no = #{bo.tradeNo}
+            </if>
             <if test = "bo.refundNo != null and bo.refundNo != ''">
                 AND t2.refund_no = #{bo.refundNo}
             </if>