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

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

@@ -155,7 +155,7 @@ public class TaRaiseController extends BaseController {
             taRaise.setCreateDate(LocalDateTime.now());
             if (iTaRaiseService.save(taRaise)) {
                 // 为邀请制，添加认筹被邀请清单
-                if (CommConstant.STATUS_NORMAL == taRaise.getIsInvite()) {
+                if (CommConstant.STATUS_NORMAL == taRaise.getInvite()) {
                     iTaRaiseService.saveOrUpdateInvite(taRaise, getOrgId(request), true);
                 }
                 responseBean.addSuccess(taRaise);
@@ -238,7 +238,7 @@ public class TaRaiseController extends BaseController {
             taRaise.setRaisePrice(taRaise.getRaisePrice() != null ? taRaise.getRaisePrice() : null);
             if (iTaRaiseService.updateById(taRaise)) {
                 // 为邀请制，添加认筹被邀请清单
-                if (CommConstant.STATUS_NORMAL == taRaise.getIsInvite()) {
+                if (CommConstant.STATUS_NORMAL == taRaise.getInvite()) {
                     iTaRaiseService.saveOrUpdateInvite(taRaise, getOrgId(request), false);
                 }
                 responseBean.addSuccess(taRaise);

src/main/java/com/huiju/estateagents/eContract/controller/TaCompanyController.java

@@ -91,7 +91,7 @@ public class TaCompanyController extends BaseController {
             queryWrapper.like(StringUtils.isNotBlank(companyName), "company_name", companyName);
             queryWrapper.like(StringUtils.isNotBlank(companyCode), "company_code", companyCode);
             queryWrapper.eq(StringUtils.isNotBlank(certifiedStatus), "certified_status", certifiedStatus);
-            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            queryWrapper.eq("status", 2);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaCompany> result = iTaCompanyService.page(pg, queryWrapper);

src/main/java/com/huiju/estateagents/entity/TaRaise.java

@@ -170,8 +170,7 @@ public class TaRaise implements Serializable {
     /**
      * 是否邀请制 1是 0否
      */
-    @TableField(exist = false)
-    private Integer isInvite;
+    private Integer invite;
 
     /**
      * 被邀请电话号码

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

@@ -435,7 +435,7 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
                         map.put("taContract", taContract);
                     }
                 } else {
-                    taRaiseRecord.setShowContract(0);
+                    taRaiseRecord.setShowContract(1);
                 }
             } else {
                 taRaiseRecord.setShowContract(0);
@@ -448,7 +448,6 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
         map.put("taRaiseHouseList", taRaiseHouseList);
         map.put("houseList", houseList);
         map.put("taOrder", taOrder);
-
         map.put("taRaise", taRaise);
         responseBean.addSuccess(map);
         return responseBean;

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

@@ -114,23 +114,20 @@ public class TaRaiseServiceImpl extends ServiceImpl<TaRaiseMapper, TaRaise> impl
             return responseBean;
         }
 
-        // 获取邀请人数据
-        QueryWrapper<TaRaiseInvite> taRaiseInviteQueryWrapper = new QueryWrapper<>();
-        taRaiseInviteQueryWrapper.eq("org_id", orgId);
-        taRaiseInviteQueryWrapper.eq("raise_id", taRaise.getRaiseId());
-        taRaiseInviteQueryWrapper.orderByAsc("create_date");
-        List<TaRaiseInvite> taRaiseInviteList = taRaiseInviteService.list(taRaiseInviteQueryWrapper);
-        StringBuilder inviteTelSb = new StringBuilder();
-        taRaiseInviteList.stream().forEach(record -> {
-            inviteTelSb.append(record.getInviteTel() + "\n");
-        });
-
-        if (CollectionUtils.isEmpty(taRaiseInviteList)) {
-            taRaise.setIsInvite(CommConstant.STATUS_UNACCALIMED);
-        } else {
-            taRaise.setIsInvite(CommConstant.STATUS_NORMAL);
+        if (taRaise.getInvite() != null && CommConstant.STATUS_NORMAL == taRaise.getInvite()) {
+            // 获取邀请人数据
+            QueryWrapper<TaRaiseInvite> taRaiseInviteQueryWrapper = new QueryWrapper<>();
+            taRaiseInviteQueryWrapper.eq("org_id", orgId);
+            taRaiseInviteQueryWrapper.eq("raise_id", taRaise.getRaiseId());
+            taRaiseInviteQueryWrapper.orderByAsc("create_date");
+            List<TaRaiseInvite> taRaiseInviteList = taRaiseInviteService.list(taRaiseInviteQueryWrapper);
+            StringBuilder inviteTelSb = new StringBuilder();
+            taRaiseInviteList.stream().forEach(record -> {
+                inviteTelSb.append(record.getInviteTel() + "\n");
+            });
             taRaise.setInviteTel(inviteTelSb.toString());
         }
+
         taRaise.setRaisePrice(taRaise.getRaisePrice() == null ? null : taRaise.getRaisePrice());
         responseBean.addSuccess(taRaise);
         return responseBean;
@@ -197,21 +194,21 @@ public class TaRaiseServiceImpl extends ServiceImpl<TaRaiseMapper, TaRaise> impl
             taRaiseInvite.setSalesBatchId(taRaise.getSalesBatchId());
             taRaiseInvite.setCreateDate(LocalDateTime.now());
 
-            // 为新增 直接增加，跳过重复添加数据校验
-            if (isAdd) {
+//            // 为新增 直接增加，跳过重复添加数据校验
+//            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);
-            } else {
-                QueryWrapper<TaRaiseInvite> taRaiseInviteQueryWrapper = new QueryWrapper<>();
-                taRaiseInviteQueryWrapper.eq("org_id", orgId);
-                taRaiseInviteQueryWrapper.eq("org_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);
     }