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

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

@@ -710,4 +710,9 @@ public class CommConstant {
      * 线下缴费
      */
     public static final String PAY_TYPE_OFFLINE = "offLine";
+
+    /**
+     * 线下缴费
+     */
+    public static final String PAY_TYPE_ONLINE = "onLine";
 }

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

@@ -249,7 +249,7 @@ public class TaSalesBatchController extends BaseController {
                 raiseQueryWrapper.eq("status", 1);
                 TaRaise raise = taRaiseService.getOne(raiseQueryWrapper);
                 if (raise != null) {
-                    responseBean.addError(String.format("销售批次%s关联有认筹,请先删除关联的预选模块", taSalesBatch.getSalesBatchName()));
+                    responseBean.addError(String.format("销售批次%s关联有认筹,请先删除关联的认筹模块", taSalesBatch.getSalesBatchName()));
                     return responseBean;
                 }
             }

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

@@ -769,7 +769,6 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
                 //查看是否有当前房源的预选记录
                 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);

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

@@ -169,14 +169,14 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
                 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> taRaiseHouses = taRaiseHouseMapper.selectList(taRaiseHouseQueryWrapper);
-            if (taRaiseHouses.size() > 0) {
-                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> taRaiseHouses = taRaiseHouseMapper.selectList(taRaiseHouseQueryWrapper);
+//            if (taRaiseHouses.size() > 0) {
+//                throw new Exception("存在已经认筹过的房源！");
+//            }
         }
     }
 
@@ -222,7 +222,7 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
         }
         taRaiseRecord.setStatus(CommConstant.STATUS_NORMAL);
         taRaiseRecord.setPayStatus(CommConstant.PAY_STATUS_UNPAID);
-        taRaiseRecord.setPayType(taRaise.getPayType());
+        taRaiseRecord.setPayType(CommConstant.PAY_TYPE_ONLINE);
         taRaiseRecord.setCreateDate(LocalDateTime.now());
         //插入认筹单信息
         taRaiseRecordMapper.insert(taRaiseRecord);
@@ -250,9 +250,12 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
         //把idcard字断更新进person表
         if (StringUtil.isEmpty(taPerson.getIdcard())) {
             taPerson.setIdcard(taRaiseRecord.getIdcard());
-            taPersonMapper.updateById(taPerson);
+        }
+        if (StringUtil.isEmpty(taPerson.getName())) {
+            taPerson.setName(taRaiseRecord.getName());
         }
 
+        taPersonMapper.updateById(taPerson);
     }
 
     /**

src/main/resources/mapper/TaHousingResourcesMapper.xml

@@ -46,7 +46,7 @@
             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 (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} OR t6.person_id IS NULL)