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

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

@@ -765,6 +765,12 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
             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<>();
@@ -789,12 +795,6 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
 //            }
 
         }
-        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/TaPreselectionRecordServiceImpl.java

@@ -114,9 +114,11 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
             TaHousingResources housingResources = taHousingResourcesService.getOne(housingQueryWrapper);
             //户型图name
             TaBuildingApartment buildingApartment = taBuildingApartmentService.getById(housingResources.getApartmentId());
-            housingResources.setApartmentName(buildingApartment.getApartmentName());
-            housingResources.setBuildingArea(buildingApartment.getBuildingArea());
-            housingResources.setInsideArea(buildingApartment.getInsideArea());
+            if (null != buildingApartment){
+                housingResources.setApartmentName(buildingApartment.getApartmentName());
+                housingResources.setBuildingArea(buildingApartment.getBuildingArea());
+                housingResources.setInsideArea(buildingApartment.getInsideArea());
+            }
             record.setHousingInfo(housingResources);
         });
 

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

@@ -253,7 +253,6 @@ public class WxPayServiceImpl implements IWxPayService {
             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);
 
             //获取房源
@@ -401,7 +400,6 @@ public class WxPayServiceImpl implements IWxPayService {
         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("自动锁房只能认筹一个房源。");

src/main/resources/mapper/TaHousingResourcesMapper.xml

@@ -342,7 +342,7 @@
             t.*,
             t2.raise_house_id,
             t3.person_id lockingPersonId,
-            t3.name lockingPersonName
+            ifnull(t3.name, t3.nickname ) lockingPersonName
         FROM
             ta_housing_resources t
             LEFT JOIN ta_raise_house t2 ON t.house_id = t2.house_id