* 新需求

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

@@ -659,69 +659,7 @@ public class TaRaiseRecordController extends BaseController {
     public ResponseBean wxGetRaiseRecordById(@PathVariable Integer raiseRecordId, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            //获取认筹单信息
-            TaRaiseRecord taRaiseRecord = iTaRaiseRecordService.getById(raiseRecordId);
-
-            String personId = getPersonId(request);
-            //认筹表数据
-            TaRaise taRaise = taRaiseService.getById(taRaiseRecord.getRaiseId());
-            taRaise.setRaisePrice(taRaise.getRaisePrice());
-            //置业顾问信息
-            TaUser consultantInfo = taUserService.getById(taRaiseRecord.getUserId());
-            if (null != consultantInfo) {
-                //职业顾问信息
-                TaPerson consultantPerson = taPersonService.getOne(new QueryWrapper<TaPerson>().eq("user_id", taRaiseRecord.getUserId()));
-                if (null != consultantPerson) {
-                    consultantInfo.setConsultantPersonId(consultantPerson.getPersonId());
-                }
-            }
-
-            taRaiseRecord.setConsultantInfo(consultantInfo);
-            //房源与认筹单关系图
-            List<TaRaiseHouse> taRaiseHouseList = taRaiseHouseService.list(new QueryWrapper<TaRaiseHouse>().eq("raise_record_id", taRaiseRecord.getRaiseRecordId()));
-
-            //房源信息
-            List<TaHousingResources> houseList = (List<TaHousingResources>) taHousingResourcesService.listByIds(taRaiseHouseList.stream().map(TaRaiseHouse::getHouseId).collect(Collectors.toList()));
-
-            //我的认筹和锁定
-            houseList.forEach(e -> {
-                taRaiseHouseList.forEach(r -> {
-                    //我的认筹
-                    if (e.getHouseId().equals(r.getHouseId()) && CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(e.getHouseLockingStatus()) && personId.equals(e.getHouseLockingPerson())) {
-                        e.setMineLocked("mine");
-                    }
-                });
-
-                //塞入户型信息
-                if (!StringUtils.isEmpty(e.getApartmentId())) {
-                    TaBuildingApartment buildingApartment = taBuildingApartmentService.getById(e.getApartmentId());
-                    e.setApartmentName(buildingApartment.getApartmentName());
-                    e.setInsideArea(buildingApartment.getInsideArea());
-                    e.setBuildingArea(buildingApartment.getBuildingArea());
-                    //塞入户型图信息
-                    List<String> apartMentIds = new ArrayList<>();
-                    apartMentIds.add(e.getApartmentId());
-                    List<TaBuildingImg> apartMentList = taBuildingImgService.getAparemnetList(apartMentIds);
-                    e.setApartmentImgList(apartMentList);
-                }
-            });
-
-            Map<String, Object> map = new HashMap<>();
-            map.put("refundOrder", null);
-            //订单信息
-            TaOrder taOrder = taOrderService.getById(taRaiseRecord.getOrderId());
-            if (null != taOrder) {
-                //退费信息
-                TaOrder refundOrder = taOrderService.getOne(new QueryWrapper<TaOrder>().eq("parent_order_id", taOrder.getOrderId()));
-                map.put("refundOrder", refundOrder);
-            }
-            map.put("taRaiseRecord", taRaiseRecord);
-            map.put("taRaiseHouseList", taRaiseHouseList);
-            map.put("houseList", houseList);
-            map.put("taOrder", taOrder);
-
-            map.put("taRaise", taRaise);
-            responseBean.addSuccess(map);
+            responseBean = iTaRaiseRecordService.wxGetRaiseRecordById(raiseRecordId, getPersonId(request), getOrgId(request));
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("微信端获取认筹单详细信息 -=- {}", e.toString());

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

@@ -188,11 +188,12 @@ public class TaCompanyOrgController extends BaseController {
                                           String companyName,
                                           String companyCode,
                                           String certifiedStatus,
+                                          Integer companyStatus,
                                           String orgName,
                                           String miniAppName) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaCompanyOrgService.listCompanyOrg(pageNum, pageSize, companyName, companyCode, certifiedStatus, orgName, miniAppName);
+            responseBean = iTaCompanyOrgService.listCompanyOrg(pageNum, pageSize, companyName, companyCode, certifiedStatus,companyStatus, orgName, miniAppName);
             logger.info("TaCompanyOrgController.listCompanyOrg 返回结果：{}", JSONObject.toJSONString(responseBean));
         } catch (Exception e) {
             logger.error("TaCompanyOrgController.listCompanyOrg 异常：", e);

src/main/java/com/huiju/estateagents/eContract/entity/TaCompanyOrg.java

@@ -3,15 +3,17 @@ package com.huiju.estateagents.eContract.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
  * <p>
- * 企业和组织关系表 
+ * 企业和组织关系表
  * </p>
  *
  * @author fxf
@@ -75,4 +77,10 @@ public class TaCompanyOrg implements Serializable {
     @TableField(exist = false)
     private String miniAppName;
 
+    /**
+     * 认证公司状态
+     */
+    @TableField(exist = false)
+    private Integer companyStatus;
+
 }

src/main/java/com/huiju/estateagents/eContract/mapper/TaCompanyOrgMapper.java

@@ -33,6 +33,7 @@ public interface TaCompanyOrgMapper extends BaseMapper<TaCompanyOrg> {
                                           @Param("companyName") String companyName,
                                           @Param("companyCode") String companyCode,
                                           @Param("certifiedStatus") String certifiedStatus,
+                                          @Param("companyStatus") Integer companyStatus,
                                           @Param("orgName") String orgName,
                                           @Param("miniAppName") String miniAppName);
 }

src/main/java/com/huiju/estateagents/eContract/service/ITaCompanyOrgService.java

@@ -22,9 +22,10 @@ public interface ITaCompanyOrgService extends IService<TaCompanyOrg> {
      * @param companyName     企业名称
      * @param companyCode     企业编号
      * @param certifiedStatus 实名认证状态
+     * @param companyStatus   企业状态
      * @param orgName         组织名称
      * @param miniAppName     小程序名称
      * @return
      */
-    ResponseBean listCompanyOrg(Integer pageNum, Integer pageSize, String companyName, String companyCode, String certifiedStatus, String orgName, String miniAppName);
+    ResponseBean listCompanyOrg(Integer pageNum, Integer pageSize, String companyName, String companyCode, String certifiedStatus, Integer companyStatus, String orgName, String miniAppName);
 }

src/main/java/com/huiju/estateagents/eContract/service/impl/TaCompanyOrgServiceImpl.java

@@ -24,12 +24,13 @@ public class TaCompanyOrgServiceImpl extends ServiceImpl<TaCompanyOrgMapper, TaC
     @Autowired
     private TaCompanyOrgMapper taCompanyOrgMapper;
 
-    public ResponseBean listCompanyOrg(Integer pageNum, Integer pageSize, String companyName, String companyCode, String certifiedStatus, String orgName, String miniAppName) {
+    public ResponseBean listCompanyOrg(Integer pageNum, Integer pageSize, String companyName, String companyCode, String certifiedStatus,
+                                       Integer companyStatus, String orgName, String miniAppName) {
         ResponseBean responseBean = new ResponseBean();
 
         // 组装分页
         IPage<TaCompanyOrg> pg = new Page<>(pageNum, pageSize);
-        pg = taCompanyOrgMapper.listCompanyAndOrg(pg,companyName,companyCode,certifiedStatus,orgName,miniAppName);
+        pg = taCompanyOrgMapper.listCompanyAndOrg(pg, companyName, companyCode, certifiedStatus, companyStatus, orgName, miniAppName);
         responseBean.addSuccess(pg);
         return responseBean;
     }

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

@@ -251,4 +251,10 @@ public class TaRaiseRecord implements Serializable {
      */
     @TableField(exist = false)
     private Integer refundedOrderId;
+
+    /**
+     * 是否展示签署合同 1是 0否
+     */
+    @TableField(exist = false)
+    private Integer showContract;
 }

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

@@ -101,5 +101,13 @@ public interface ITaRaiseRecordService extends IService<TaRaiseRecord> {
      * @param houseLockingStatus
      * @return
      */
-    Boolean updateHouseLockingStatus(Integer raiseRecordId, String houseLockingStatus,String personId);
+    Boolean updateHouseLockingStatus(Integer raiseRecordId, String houseLockingStatus, String personId);
+
+    /**
+     * 获取认筹单详情-微信端
+     *
+     * @param raiseRecordId
+     * @return
+     */
+    ResponseBean wxGetRaiseRecordById(Integer raiseRecordId, String personId,Integer orgId);
 }

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

@@ -13,11 +13,13 @@ import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.service.impl.TaUserServiceImpl;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.SMSUtils;
+import com.huiju.estateagents.eContract.entity.TaContract;
+import com.huiju.estateagents.eContract.entity.TaContractBusiness;
+import com.huiju.estateagents.eContract.service.ITaContractBusinessService;
+import com.huiju.estateagents.eContract.service.ITaContractService;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
-import com.huiju.estateagents.po.TaHousingResourcesPO;
-import com.huiju.estateagents.service.ITaRaiseRecordService;
-import com.huiju.estateagents.service.ITaUvService;
+import com.huiju.estateagents.service.*;
 import jodd.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -26,9 +28,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -76,6 +82,30 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
     @Autowired
     SMSUtils smsUtils;
 
+    @Autowired
+    private ITaRaiseService taRaiseService;
+
+    @Autowired
+    private ITaOrderService taOrderService;
+
+    @Autowired
+    private ITaBuildingImgService taBuildingImgService;
+
+    @Autowired
+    private ITaRaiseHouseService taRaiseHouseService;
+
+    @Autowired
+    private ITaHousingResourcesService taHousingResourcesService;
+
+    @Autowired
+    private ITaBuildingApartmentService taBuildingApartmentService;
+
+    @Autowired
+    private ITaContractService iTaContractService;
+
+    @Autowired
+    private ITaContractBusinessService iTaContractBusinessService;
+
     @Override
     public ResponseBean listHousingRaiseByCondition(HousingRaiseRequestBO requestBO, Integer pageNumber, Integer pageSize) {
         logger.info("TaRaiseRecordServiceImpl.listRaiseRecordByCondition 接收参数：bo:{},pageNumber:{},pageSize:{}", JSONObject.toJSONString(requestBO), pageNumber, pageSize);
@@ -320,4 +350,107 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
         logger.info("TaRaiseRecordServiceImpl.updateHouseLockingStatus 接收参数:raiseRecordId:{},houseLockingStatus:{}", raiseRecordId, houseLockingStatus);
         return taHousingResourcesMapper.updateHouseLockingStatus(raiseRecordId, houseLockingStatus, personId);
     }
+
+    @Override
+    public ResponseBean wxGetRaiseRecordById(Integer raiseRecordId, String personId, Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        //获取认筹单信息
+        TaRaiseRecord taRaiseRecord = getById(raiseRecordId);
+
+        //认筹表数据
+        TaRaise taRaise = taRaiseService.getById(taRaiseRecord.getRaiseId());
+        taRaise.setRaisePrice(taRaise.getRaisePrice());
+        //置业顾问信息
+        TaUser consultantInfo = taUserService.getById(taRaiseRecord.getUserId());
+        if (null != consultantInfo) {
+            //职业顾问信息
+            TaPerson consultantPerson = taPersonService.getOne(new QueryWrapper<TaPerson>().eq("user_id", taRaiseRecord.getUserId()));
+            if (null != consultantPerson) {
+                consultantInfo.setConsultantPersonId(consultantPerson.getPersonId());
+            }
+        }
+
+        taRaiseRecord.setConsultantInfo(consultantInfo);
+        //房源与认筹单关系图
+        List<TaRaiseHouse> taRaiseHouseList = taRaiseHouseService.list(new QueryWrapper<TaRaiseHouse>().eq("raise_record_id", taRaiseRecord.getRaiseRecordId()));
+
+        //房源信息
+        List<TaHousingResources> houseList = (List<TaHousingResources>) taHousingResourcesService.listByIds(taRaiseHouseList.stream().map(TaRaiseHouse::getHouseId).collect(Collectors.toList()));
+
+        //我的认筹和锁定
+        houseList.forEach(e -> {
+            taRaiseHouseList.forEach(r -> {
+                //我的认筹
+                if (e.getHouseId().equals(r.getHouseId()) && CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(e.getHouseLockingStatus()) && personId.equals(e.getHouseLockingPerson())) {
+                    e.setMineLocked("mine");
+                }
+            });
+
+            //塞入户型信息
+            if (!StringUtils.isEmpty(e.getApartmentId())) {
+                TaBuildingApartment buildingApartment = taBuildingApartmentService.getById(e.getApartmentId());
+                e.setApartmentName(buildingApartment.getApartmentName());
+                e.setInsideArea(buildingApartment.getInsideArea());
+                e.setBuildingArea(buildingApartment.getBuildingArea());
+                //塞入户型图信息
+                List<String> apartMentIds = new ArrayList<>();
+                apartMentIds.add(e.getApartmentId());
+                List<TaBuildingImg> apartMentList = taBuildingImgService.getAparemnetList(apartMentIds);
+                e.setApartmentImgList(apartMentList);
+            }
+        });
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("refundOrder", null);
+        //订单信息
+        TaOrder taOrder = taOrderService.getById(taRaiseRecord.getOrderId());
+        if (null != taOrder) {
+            //退费信息
+            TaOrder refundOrder = taOrderService.getOne(new QueryWrapper<TaOrder>().eq("parent_order_id", taOrder.getOrderId()));
+            map.put("refundOrder", refundOrder);
+        }
+
+        // 是否展示签署合同入口
+        if (CommConstant.STATUS_NORMAL == taRaiseRecord.getStatus() || CommConstant.PAY_STATUS_PAID == taRaiseRecord.getPayStatus()) {
+            // 是否有认筹业务合同配置
+            QueryWrapper<TaContractBusiness> taContractBusinessQueryWrapper = new QueryWrapper<>();
+            taContractBusinessQueryWrapper.eq("target_id", raiseRecordId);
+            taContractBusinessQueryWrapper.eq("org_id", orgId);
+            taContractBusinessQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            TaContractBusiness taContractBusiness = iTaContractBusinessService.getOne(taContractBusinessQueryWrapper);
+            if (taContractBusiness != null) {
+                // 是否有有关联的认筹合同
+                QueryWrapper<TaContract> taContractQueryWrapper = new QueryWrapper<>();
+                taContractQueryWrapper.eq("org_id", orgId);
+                taContractQueryWrapper.eq("company_id", taContractBusiness.getCompanyId());
+                taContractQueryWrapper.eq("target_id", taRaiseRecord.getRaiseId());
+                taContractQueryWrapper.eq("person_id", personId);
+                TaContract taContract = iTaContractService.getOne(taContractQueryWrapper);
+                if (taContract != null) {
+                    if (taContract.getCustomerTime() == null) {
+                        taRaiseRecord.setShowContract(1);
+                    } else {
+                        taRaiseRecord.setShowContract(0);
+                        map.put("taContract", taContract);
+                    }
+                } else {
+                    taRaiseRecord.setShowContract(0);
+                }
+            } else {
+                taRaiseRecord.setShowContract(0);
+            }
+        } else {
+            taRaiseRecord.setShowContract(0);
+        }
+
+        map.put("taRaiseRecord", taRaiseRecord);
+        map.put("taRaiseHouseList", taRaiseHouseList);
+        map.put("houseList", houseList);
+        map.put("taOrder", taOrder);
+
+        map.put("taRaise", taRaise);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
 }

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

@@ -8,6 +8,7 @@
             t2.company_name,
             t2.company_code,
             t2.certified_status,
+            t2.status companyStatus,
             t3.`name` orgName,
             t4.`name` miniAppName
         FROM
@@ -16,10 +17,13 @@
             LEFT JOIN ta_org t3 ON t.org_id = t3.org_id
             LEFT JOIN ta_miniapp t4 ON t3.org_id = t4.org_id
         WHERE
-            t2.`status` = 1
+            t2.`status` != -1
             <if test = "companyName != null and companyName != ''">
                 AND t2.company_name like CONCAT('%',#{companyName} , '%')
             </if>
+            <if test = "companyStatus != null and companyStatus != ''">
+                AND t2.`status` = #{companyStatus}
+            </if>
             <if test = "companyCode != null and companyCode != ''">
                 AND t2.company_code like CONCAT('%',#{companyCode} , '%')
             </if>