* 优化

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

@@ -118,11 +118,14 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     private TaPersonBuildingMapper taPersonBuildingMapper;
 
     @Autowired
-    private ITaRaiseInviteService iTaRaiseInviteService;
+    private ITaRaiseService iTaRaiseService;
 
     @Autowired
     private ITaPersonService iTaPersonService;
 
+    @Autowired
+    private ITaRaiseInviteService iTaRaiseInviteService;
+
     @Override
     public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId, List<TaPersonBuilding> taPersonBuildingList) {
         Page<TaBuilding> page = new Page<>();
@@ -346,22 +349,22 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         List<TaSalesBatch> resultSalesBatchList = new ArrayList<>();
         taSalesBatch.stream().forEach(record -> {
             // 查询批次下认筹是否开启邀请制
-            QueryWrapper<TaRaiseInvite> taRaiseInviteQueryWrapper = new QueryWrapper<>();
-            taRaiseInviteQueryWrapper.eq("org_id", orgId);
-            taRaiseInviteQueryWrapper.eq("sales_batch_id", record.getSalesBatchId());
-            TaRaiseInvite taRaiseInvite = iTaRaiseInviteService.getOne(taRaiseInviteQueryWrapper);
-            if (taRaiseInvite == null) {
+            QueryWrapper<TaRaise> taRaiseQueryWrapper = new QueryWrapper<>();
+            taRaiseQueryWrapper.eq("org_id", orgId);
+            taRaiseQueryWrapper.eq("sales_batch_id", record.getSalesBatchId());
+            TaRaise taRaise = iTaRaiseService.getOne(taRaiseQueryWrapper);
+            if (taRaise != null && taRaise.getInvite() != CommConstant.STATUS_NORMAL) {
                 resultSalesBatchList.add(record);
                 return;
             }
 
             // 若开启邀请制，校验该用户是否在邀请列表中
-            taRaiseInviteQueryWrapper = new QueryWrapper<>();
+            QueryWrapper<TaRaiseInvite> taRaiseInviteQueryWrapper = new QueryWrapper<>();
             taRaiseInviteQueryWrapper.eq("org_id", orgId);
             taRaiseInviteQueryWrapper.eq("invite_tel", person.getTel());
             taRaiseInviteQueryWrapper.eq("sales_batch_id", record.getSalesBatchId());
-            TaRaiseInvite taRaiseInvite2 = iTaRaiseInviteService.getOne(taRaiseInviteQueryWrapper);
-            if(taRaiseInvite2 != null){
+            TaRaiseInvite taRaiseInvite = iTaRaiseInviteService.getOne(taRaiseInviteQueryWrapper);
+            if (taRaiseInvite != null) {
                 resultSalesBatchList.add(record);
                 return;
             }

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

@@ -186,7 +186,7 @@ public class TaRaiseServiceImpl extends ServiceImpl<TaRaiseMapper, TaRaise> impl
         String[] inviteTelArr = StringUtils.isEmpty(taRaise.getInviteTel()) ?
                 new String[]{} : taRaise.getInviteTel().split("\n");
 
-        Arrays.asList(inviteTelArr).stream().forEach(record -> {
+        Arrays.asList(inviteTelArr).stream().distinct().forEach(record -> {
             TaRaiseInvite taRaiseInvite = new TaRaiseInvite();
             taRaiseInvite.setOrgId(orgId);
             taRaiseInvite.setRaiseId(taRaise.getRaiseId());
@@ -194,21 +194,21 @@ public class TaRaiseServiceImpl extends ServiceImpl<TaRaiseMapper, TaRaise> impl
             taRaiseInvite.setSalesBatchId(taRaise.getSalesBatchId());
             taRaiseInvite.setCreateDate(LocalDateTime.now());
 
-//            // 为新增 直接增加，跳过重复添加数据校验
-//            if (isAdd) {
-//                taRaiseInvite.setInviteTel(record);
-//                taRaiseInviteList.add(taRaiseInvite);
-//            } else {
-            QueryWrapper<TaRaiseInvite> taRaiseInviteQueryWrapper = new QueryWrapper<>();
-            taRaiseInviteQueryWrapper.eq("org_id", orgId);
-            taRaiseInviteQueryWrapper.eq("raise_id", taRaise.getRaiseId());
-            taRaiseInviteQueryWrapper.eq("invite_tel", record);
-            TaRaiseInvite queryResult = taRaiseInviteService.getOne(taRaiseInviteQueryWrapper);
-            if (queryResult == null) {
+            // 为新增 直接增加，跳过重复添加数据校验
+            if (isAdd) {
                 taRaiseInvite.setInviteTel(record);
                 taRaiseInviteList.add(taRaiseInvite);
+            } else {
+                QueryWrapper<TaRaiseInvite> taRaiseInviteQueryWrapper = new QueryWrapper<>();
+                taRaiseInviteQueryWrapper.eq("org_id", orgId);
+                taRaiseInviteQueryWrapper.eq("raise_id", taRaise.getRaiseId());
+                taRaiseInviteQueryWrapper.eq("invite_tel", record);
+                TaRaiseInvite queryResult = taRaiseInviteService.getOne(taRaiseInviteQueryWrapper);
+                if (queryResult == null) {
+                    taRaiseInvite.setInviteTel(record);
+                    taRaiseInviteList.add(taRaiseInvite);
+                }
             }
-//            }
         });
         return taRaiseInviteService.saveBatch(taRaiseInviteList);
     }