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

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

             if (taHousingResources.getSalesBatchId() != taHousingResourcesChecked.getSalesBatchId()){
                 throw new Exception("非同一批次房源");
             }
+            if (taHousingResourcesChecked.getStatus() != CommConstant.STATUS_NORMAL) {
+                throw new Exception("其中有房源已被取消发布");
+            }
+            if (taRaise.getHouseLockingType().equals(CommConstant.HOUSE_LOCKING_TYPE_AUTO) && CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(taHousingResourcesChecked.getHouseLockingStatus())){
+                throw new Exception("其中有房源已被其他客户锁定");
+            }
             if (taRaise.getNeedPreselection()) {
                 //查看是否有当前房源的预选记录
                 QueryWrapper<TaPreselectionRecord> preselectionRecordQueryWrapper = new QueryWrapper<>();
 //            }
 
         }
-        if (taHousingResources.getStatus() != CommConstant.STATUS_NORMAL) {
-            throw new Exception("房源已被取消发布");
-        }
-        if (taRaise.getHouseLockingType().equals(CommConstant.HOUSE_LOCKING_TYPE_AUTO) && CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(taHousingResources.getHouseLockingStatus())){
-            throw new Exception("房源已被其他客户锁定");
-        }
         //销售批次信息
         TaSalesBatch taSalesBatch = taSalesBatchMapper.selectById(taHousingResources.getSalesBatchId());
         //销售批次校验

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

             QueryWrapper<TaRaiseHouse> taRaiseHouseQueryWrapper = new QueryWrapper<>();
             taRaiseHouseQueryWrapper.eq("org_id",taOrder.getOrgId());
             taRaiseHouseQueryWrapper.eq("raise_record_id",taRaiseRecord.getRaiseRecordId());
-            taRaiseHouseQueryWrapper.eq("person_id",taOrder.getPersonId());
             TaRaiseHouse taRaiseHouse = taRaiseHouseMapper.selectOne(taRaiseHouseQueryWrapper);
 
             //获取房源
         QueryWrapper<TaRaiseHouse> taRaiseHouseQueryWrapper = new QueryWrapper<>();
         taRaiseHouseQueryWrapper.eq("org_id",taOrder.getOrgId());
         taRaiseHouseQueryWrapper.eq("raise_record_id",taRaiseRecord.getRaiseRecordId());
-        taRaiseHouseQueryWrapper.eq("person_id",taOrder.getPersonId());
         List<TaRaiseHouse> taRaiseHouseList = taRaiseHouseMapper.selectList(taRaiseHouseQueryWrapper);
         if (taRaiseHouseList.size() != 1){
             throw new Exception("自动锁房只能认筹一个房源。");