顾绍勇 5 years ago
parent
commit
c1ab90c464

+ 12
- 9
src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java View File

118
     private TaPersonBuildingMapper taPersonBuildingMapper;
118
     private TaPersonBuildingMapper taPersonBuildingMapper;
119
 
119
 
120
     @Autowired
120
     @Autowired
121
-    private ITaRaiseInviteService iTaRaiseInviteService;
121
+    private ITaRaiseService iTaRaiseService;
122
 
122
 
123
     @Autowired
123
     @Autowired
124
     private ITaPersonService iTaPersonService;
124
     private ITaPersonService iTaPersonService;
125
 
125
 
126
+    @Autowired
127
+    private ITaRaiseInviteService iTaRaiseInviteService;
128
+
126
     @Override
129
     @Override
127
     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) {
130
     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) {
128
         Page<TaBuilding> page = new Page<>();
131
         Page<TaBuilding> page = new Page<>();
346
         List<TaSalesBatch> resultSalesBatchList = new ArrayList<>();
349
         List<TaSalesBatch> resultSalesBatchList = new ArrayList<>();
347
         taSalesBatch.stream().forEach(record -> {
350
         taSalesBatch.stream().forEach(record -> {
348
             // 查询批次下认筹是否开启邀请制
351
             // 查询批次下认筹是否开启邀请制
349
-            QueryWrapper<TaRaiseInvite> taRaiseInviteQueryWrapper = new QueryWrapper<>();
350
-            taRaiseInviteQueryWrapper.eq("org_id", orgId);
351
-            taRaiseInviteQueryWrapper.eq("sales_batch_id", record.getSalesBatchId());
352
-            TaRaiseInvite taRaiseInvite = iTaRaiseInviteService.getOne(taRaiseInviteQueryWrapper);
353
-            if (taRaiseInvite == null) {
352
+            QueryWrapper<TaRaise> taRaiseQueryWrapper = new QueryWrapper<>();
353
+            taRaiseQueryWrapper.eq("org_id", orgId);
354
+            taRaiseQueryWrapper.eq("sales_batch_id", record.getSalesBatchId());
355
+            TaRaise taRaise = iTaRaiseService.getOne(taRaiseQueryWrapper);
356
+            if (taRaise != null && taRaise.getInvite() != CommConstant.STATUS_NORMAL) {
354
                 resultSalesBatchList.add(record);
357
                 resultSalesBatchList.add(record);
355
                 return;
358
                 return;
356
             }
359
             }
357
 
360
 
358
             // 若开启邀请制,校验该用户是否在邀请列表中
361
             // 若开启邀请制,校验该用户是否在邀请列表中
359
-            taRaiseInviteQueryWrapper = new QueryWrapper<>();
362
+            QueryWrapper<TaRaiseInvite> taRaiseInviteQueryWrapper = new QueryWrapper<>();
360
             taRaiseInviteQueryWrapper.eq("org_id", orgId);
363
             taRaiseInviteQueryWrapper.eq("org_id", orgId);
361
             taRaiseInviteQueryWrapper.eq("invite_tel", person.getTel());
364
             taRaiseInviteQueryWrapper.eq("invite_tel", person.getTel());
362
             taRaiseInviteQueryWrapper.eq("sales_batch_id", record.getSalesBatchId());
365
             taRaiseInviteQueryWrapper.eq("sales_batch_id", record.getSalesBatchId());
363
-            TaRaiseInvite taRaiseInvite2 = iTaRaiseInviteService.getOne(taRaiseInviteQueryWrapper);
364
-            if(taRaiseInvite2 != null){
366
+            TaRaiseInvite taRaiseInvite = iTaRaiseInviteService.getOne(taRaiseInviteQueryWrapper);
367
+            if (taRaiseInvite != null) {
365
                 resultSalesBatchList.add(record);
368
                 resultSalesBatchList.add(record);
366
                 return;
369
                 return;
367
             }
370
             }

+ 13
- 13
src/main/java/com/huiju/estateagents/service/impl/TaRaiseServiceImpl.java View File

186
         String[] inviteTelArr = StringUtils.isEmpty(taRaise.getInviteTel()) ?
186
         String[] inviteTelArr = StringUtils.isEmpty(taRaise.getInviteTel()) ?
187
                 new String[]{} : taRaise.getInviteTel().split("\n");
187
                 new String[]{} : taRaise.getInviteTel().split("\n");
188
 
188
 
189
-        Arrays.asList(inviteTelArr).stream().forEach(record -> {
189
+        Arrays.asList(inviteTelArr).stream().distinct().forEach(record -> {
190
             TaRaiseInvite taRaiseInvite = new TaRaiseInvite();
190
             TaRaiseInvite taRaiseInvite = new TaRaiseInvite();
191
             taRaiseInvite.setOrgId(orgId);
191
             taRaiseInvite.setOrgId(orgId);
192
             taRaiseInvite.setRaiseId(taRaise.getRaiseId());
192
             taRaiseInvite.setRaiseId(taRaise.getRaiseId());
194
             taRaiseInvite.setSalesBatchId(taRaise.getSalesBatchId());
194
             taRaiseInvite.setSalesBatchId(taRaise.getSalesBatchId());
195
             taRaiseInvite.setCreateDate(LocalDateTime.now());
195
             taRaiseInvite.setCreateDate(LocalDateTime.now());
196
 
196
 
197
-//            // 为新增 直接增加,跳过重复添加数据校验
198
-//            if (isAdd) {
199
-//                taRaiseInvite.setInviteTel(record);
200
-//                taRaiseInviteList.add(taRaiseInvite);
201
-//            } else {
202
-            QueryWrapper<TaRaiseInvite> taRaiseInviteQueryWrapper = new QueryWrapper<>();
203
-            taRaiseInviteQueryWrapper.eq("org_id", orgId);
204
-            taRaiseInviteQueryWrapper.eq("raise_id", taRaise.getRaiseId());
205
-            taRaiseInviteQueryWrapper.eq("invite_tel", record);
206
-            TaRaiseInvite queryResult = taRaiseInviteService.getOne(taRaiseInviteQueryWrapper);
207
-            if (queryResult == null) {
197
+            // 为新增 直接增加,跳过重复添加数据校验
198
+            if (isAdd) {
208
                 taRaiseInvite.setInviteTel(record);
199
                 taRaiseInvite.setInviteTel(record);
209
                 taRaiseInviteList.add(taRaiseInvite);
200
                 taRaiseInviteList.add(taRaiseInvite);
201
+            } else {
202
+                QueryWrapper<TaRaiseInvite> taRaiseInviteQueryWrapper = new QueryWrapper<>();
203
+                taRaiseInviteQueryWrapper.eq("org_id", orgId);
204
+                taRaiseInviteQueryWrapper.eq("raise_id", taRaise.getRaiseId());
205
+                taRaiseInviteQueryWrapper.eq("invite_tel", record);
206
+                TaRaiseInvite queryResult = taRaiseInviteService.getOne(taRaiseInviteQueryWrapper);
207
+                if (queryResult == null) {
208
+                    taRaiseInvite.setInviteTel(record);
209
+                    taRaiseInviteList.add(taRaiseInvite);
210
+                }
210
             }
211
             }
211
-//            }
212
         });
212
         });
213
         return taRaiseInviteService.saveBatch(taRaiseInviteList);
213
         return taRaiseInviteService.saveBatch(taRaiseInviteList);
214
     }
214
     }