* 新需求

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

@@ -368,7 +368,7 @@ public class TaBuildingController extends BaseController {
             return ResponseBean.error("当前账户信息异常, 清除缓存重试", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = persons.get(0);
-        return taBuildingService.buildingAllSelectId(id, person.getPersonId(), orgId);
+        return taBuildingService.buildingAllSelectId(id, person, orgId);
     }
 
     /**

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

@@ -154,32 +154,16 @@ public class TaRaiseController extends BaseController {
             taRaise.setStatus(taSalesBatch.getStatus());
             taRaise.setCreateDate(LocalDateTime.now());
             if (iTaRaiseService.save(taRaise)) {
-
                 // 为邀请制，添加认筹被邀请清单
                 if (CommConstant.STATUS_NORMAL == taRaise.getIsInvite()) {
-                    TaRaiseInvite taRaiseInvite = new TaRaiseInvite();
-                    taRaiseInvite.setOrgId(orgId);
-                    taRaiseInvite.setRaiseId(taRaise.getRaiseId());
-                    taRaiseInvite.setBuildingId(taRaise.getBuildingId());
-                    taRaiseInvite.setSalesBatchId(taSalesBatch.getSalesBatchId());
-                    taRaiseInvite.setCreateDate(LocalDateTime.now());
-                    List<TaRaiseInvite> taRaiseInviteList = new ArrayList<>();
-                    String[] inviteTelArr = StringUtils.isEmpty(taRaise.getInviteTel()) ?
-                            new String[]{} : taRaise.getInviteTel().replace("，", ",").split(",");
-                    for (String inviteTel : inviteTelArr) {
-                        taRaiseInvite.setInviteTel(inviteTel);
-                        taRaiseInviteList.add(taRaiseInvite);
-                    }
-                    iTaRaiseInviteService.saveBatch(taRaiseInviteList);
+                    iTaRaiseService.saveOrUpdateInvite(taRaise, getOrgId(request), true);
                 }
-
                 responseBean.addSuccess(taRaise);
             } else {
                 responseBean.addError("fail");
             }
         } catch (Exception e) {
-            e.printStackTrace();
-            logger.error("taRaiseAdd -=- {}", e.toString());
+            logger.error("taRaiseAdd -=- {}", e);
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -240,7 +224,8 @@ public class TaRaiseController extends BaseController {
      */
     @RequestMapping(value = "/admin/taRaise/{id}", method = RequestMethod.PUT)
     public ResponseBean taRaiseUpdate(@PathVariable Integer id,
-                                      @RequestBody TaRaise taRaise) {
+                                      @RequestBody TaRaise taRaise,
+                                      HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             Integer raisePrice = taRaise.getRaisePrice();
@@ -252,6 +237,10 @@ public class TaRaiseController extends BaseController {
             taRaise.setRaiseId(id);
             taRaise.setRaisePrice(taRaise.getRaisePrice() != null ? taRaise.getRaisePrice() : null);
             if (iTaRaiseService.updateById(taRaise)) {
+                // 为邀请制，添加认筹被邀请清单
+                if (CommConstant.STATUS_NORMAL == taRaise.getIsInvite()) {
+                    iTaRaiseService.saveOrUpdateInvite(taRaise, getOrgId(request), false);
+                }
                 responseBean.addSuccess(taRaise);
             } else {
                 responseBean.addError("fail");

src/main/java/com/huiju/estateagents/service/ITaBuildingService.java

@@ -3,6 +3,7 @@ package com.huiju.estateagents.service;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaBuilding;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 
 import java.time.LocalDateTime;
@@ -46,7 +47,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
      * @param id
      * @return
      */
-    ResponseBean buildingAllSelectId(String id,String personId, Integer orgId);
+    ResponseBean buildingAllSelectId(String id, TaPerson person, Integer orgId);
 
 
     /**

src/main/java/com/huiju/estateagents/service/ITaRaiseService.java

@@ -5,7 +5,6 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaRaise;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -49,11 +48,20 @@ public interface ITaRaiseService extends IService<TaRaise> {
     ResponseBean getRaiseById(Integer id, Integer orgId);
 
     /**
-     *
      * @param raiseId
      * @param raiseRecordId
      * @param salesBatchId
      * @return
      */
     TaRaise getRaiseProfile(Integer raiseId, Integer raiseRecordId, Integer salesBatchId);
+
+    /**
+     * 新增或添加被邀请人表
+     *
+     * @param taRaise
+     * @param orgId
+     * @param isAdd   是否新增 1是 0否，为新增则直接保存 不用校验是否已经添加过该邀请手机号
+     * @return
+     */
+    Boolean saveOrUpdateInvite(TaRaise taRaise, Integer orgId, Boolean isAdd);
 }

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

@@ -117,6 +117,12 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Autowired
     private TaPersonBuildingMapper taPersonBuildingMapper;
 
+    @Autowired
+    private ITaRaiseInviteService iTaRaiseInviteService;
+
+    @Autowired
+    private ITaPersonService iTaPersonService;
+
     @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<>();
@@ -221,7 +227,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
 
     @Override
-    public ResponseBean buildingAllSelectId(String id, String personId, Integer orgId) {
+    public ResponseBean buildingAllSelectId(String id, TaPerson person, Integer orgId) {
         // 查询基础信息
         QueryWrapper<TaBuilding> buildingtWrapper = new QueryWrapper<>();
         buildingtWrapper.lambda().gt(TaBuilding::getStatus, -1);
@@ -271,7 +277,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         getBuildingAttaches(building);
         QueryWrapper<TaSave> saveQueryWrapper = new QueryWrapper<>();
         saveQueryWrapper.eq("tagert_type", CommConstant.FAVOR_PROJECT);
-        saveQueryWrapper.eq("person_id", personId);
+        saveQueryWrapper.eq("person_id", person.getPersonId());
         saveQueryWrapper.eq("saved_target", building.getBuildingId());
         Integer num = taSaveMapper.selectCount(saveQueryWrapper);
         if (num > 0) {
@@ -308,7 +314,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         List<TaShareActivity> shareActivityList = taShareActivityMapper.selectList(shareActivityQueryWrapper);
         building.setShareActivityList(shareActivityList);
 
-        // TODO 直播活动
+        // 直播活动
         QueryWrapper<TaLiveActivity> liveActivityQueryWrapper = new QueryWrapper<>();
         liveActivityQueryWrapper.eq("building_id", id);
         liveActivityQueryWrapper.eq("status", 1);
@@ -336,8 +342,32 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         salesBatchQueryWrapper.lambda().eq(TaSalesBatch::getBuildingId, id);
         salesBatchQueryWrapper.lambda().eq(TaSalesBatch::getStatus, CommConstant.STATUS_NORMAL);
         List<TaSalesBatch> taSalesBatch = iTaSalesBatchService.list(salesBatchQueryWrapper);
-        building.setSalesBatch(taSalesBatch);
 
+        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) {
+                resultSalesBatchList.add(record);
+                return;
+            }
+
+            // 若开启邀请制，校验该用户是否在邀请列表中
+            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){
+                resultSalesBatchList.add(record);
+                return;
+            }
+        });
+
+        building.setSalesBatch(resultSalesBatchList);
         return ResponseBean.success(building);
     }
 

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

@@ -9,20 +9,22 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
-import com.huiju.estateagents.mapper.TaHousingResourcesMapper;
 import com.huiju.estateagents.mapper.TaRaiseHouseMapper;
 import com.huiju.estateagents.mapper.TaRaiseMapper;
 import com.huiju.estateagents.mapper.TaRaiseRecordMapper;
 import com.huiju.estateagents.service.ITaHousingResourcesService;
+import com.huiju.estateagents.service.ITaRaiseInviteService;
 import com.huiju.estateagents.service.ITaRaiseService;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections4.QueueUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Array;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -51,6 +53,9 @@ public class TaRaiseServiceImpl extends ServiceImpl<TaRaiseMapper, TaRaise> impl
     @Autowired
     private ITaHousingResourcesService taHousingResourcesService;
 
+    @Autowired
+    private ITaRaiseInviteService taRaiseInviteService;
+
     @Override
     public ResponseBean listRaiseByCondition(Integer pageSize, Integer pageNum, String salesBatchName, String buildingId, Integer orgId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId) {
         logger.info("listSalesBatchForRaise 接收参数：pageSize:{},pageNum:{},salesBatchName:{},buildilgId:{},orgId:{},status:{},taPersonBuildingListByUserId:{}",
@@ -109,6 +114,23 @@ 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);
+            taRaise.setInviteTel(inviteTelSb.toString());
+        }
         taRaise.setRaisePrice(taRaise.getRaisePrice() == null ? null : taRaise.getRaisePrice());
         responseBean.addSuccess(taRaise);
         return responseBean;
@@ -160,4 +182,37 @@ public class TaRaiseServiceImpl extends ServiceImpl<TaRaiseMapper, TaRaise> impl
 
         return taRaise;
     }
+
+    @Override
+    public Boolean saveOrUpdateInvite(TaRaise taRaise, Integer orgId, Boolean isAdd) {
+        List<TaRaiseInvite> taRaiseInviteList = new ArrayList<>();
+        String[] inviteTelArr = StringUtils.isEmpty(taRaise.getInviteTel()) ?
+                new String[]{} : taRaise.getInviteTel().split("\n");
+
+        Arrays.asList(inviteTelArr).stream().forEach(record -> {
+            TaRaiseInvite taRaiseInvite = new TaRaiseInvite();
+            taRaiseInvite.setOrgId(orgId);
+            taRaiseInvite.setRaiseId(taRaise.getRaiseId());
+            taRaiseInvite.setBuildingId(taRaise.getBuildingId());
+            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("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);
+    }
 }

src/main/resources/mapper/eContract/TaCompanyOrgMapper.xml

@@ -6,6 +6,7 @@
         SELECT
             t.*,
             t2.company_name,
+            t2.company_code,
             t2.certified_status,
             t3.`name` orgName,
             t4.`name` miniAppName

src/main/resources/mapper/eContract/TaContractMapper.xml

@@ -37,10 +37,10 @@
                 <otherwise></otherwise>
             </choose>
             <choose>
-                <when test="signatoryStatus == 0">
+                <when test="customerStatus == 0">
                     AND t.customer_time = NULL
                 </when>
-                <when test="signatoryStatus == 1">
+                <when test="customerStatus == 1">
                     AND t.customer_time &lt;&gt; NULL
                 </when>
                 <otherwise></otherwise>
@@ -99,7 +99,7 @@
                 AND t.settlement_time &gt;= #{bo.settlementStartTime}
             </if>
             <if test=" bo.settlementEndTime != null">
-                AND t.settlement_time &lt;= #{bo.settlementEndTime.}
+                AND t.settlement_time &lt;= #{bo.settlementEndTime}
             </if>
         </where>
         ORDER BY