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

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

@@ -225,7 +225,7 @@ public class TaHousingResourcesController extends BaseController {
                 orgId, salesBatchId, startPrice, endPrice, apartmentId);
 
         try {
-            responseBean.addSuccess(iTaHousingResourcesService.listHousingResources(orgId, salesBatchId, startPrice, endPrice, apartmentId));
+            responseBean.addSuccess(iTaHousingResourcesService.listHousingResources(orgId, salesBatchId, startPrice, endPrice, apartmentId, 1));
         } catch (Exception e) {
             logger.error("listHousingResources -=- {}", e);
             responseBean.addError(e.getMessage());
@@ -247,7 +247,7 @@ public class TaHousingResourcesController extends BaseController {
         Integer orgId = getOrgId(request);
 
         try {
-            responseBean.addSuccess(iTaHousingResourcesService.listHousingResources(orgId, salesBatchId, "", "", ""));
+            responseBean.addSuccess(iTaHousingResourcesService.listHousingResources(orgId, salesBatchId, "", "", "", 0));
         } catch (Exception e) {
             logger.error("listHousingResourcesFormCms -=- {}", e);
             responseBean.addError(e.getMessage());

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

@@ -8,9 +8,11 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.entity.TaSalesBatch;
+import com.huiju.estateagents.entity.TaShareContent;
 import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.service.ITaMiniappService;
 import com.huiju.estateagents.service.ITaSalesBatchService;
+import com.huiju.estateagents.service.TaShareContentService;
 import io.swagger.models.auth.In;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -45,6 +47,9 @@ public class TaSalesBatchController extends BaseController {
     @Autowired
     public IMiniAppService miniAppService;
 
+    @Autowired
+    private TaShareContentService taShareContentService;
+
     /**
      * 分页查询列表
      *
@@ -83,7 +88,9 @@ public class TaSalesBatchController extends BaseController {
     public ResponseBean taSalesBatchAdd(@RequestBody TaSalesBatch taSalesBatch, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            taSalesBatch.setOrgId(getOrgId(request));
+            Integer orgId = getOrgId(request);
+
+            taSalesBatch.setOrgId(orgId);
             taSalesBatch.setCreateDate(LocalDateTime.now());
             taSalesBatch.setUpdateTime(LocalDateTime.now());
             iTaSalesBatchService.save(taSalesBatch);
@@ -95,6 +102,18 @@ public class TaSalesBatchController extends BaseController {
             ResponseBean taMiniappQrcode = miniAppService.getQrCode(CommConstant.HOUSE_QRCODE.replace("#0", taSalesBatch.getSalesBatchId().toString()).replace("#1", "house"), taMiniapp.getMiniappId());
             taSalesBatch.setQrCode(String.valueOf(taMiniappQrcode.getData()));
             iTaSalesBatchService.updateById(taSalesBatch);
+
+            // 设置默认分享设置
+            TaShareContent shareContent = new TaShareContent();
+            shareContent.setOrgId(orgId);
+            shareContent.setTargetId(taSalesBatch.getSalesBatchId().toString());
+            shareContent.setShareContentTitle("诚挚邀您在线选房购房~");
+            shareContent.setShareContentImg(taSalesBatch.getAerialViewImg());
+            shareContent.setShareContentType("house");
+            shareContent.setStatus(1);
+            shareContent.setCreateDate(LocalDateTime.now());
+            taShareContentService.save(shareContent);
+
             responseBean.addSuccess(taSalesBatch);
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/com/huiju/estateagents/mapper/TaHousingResourcesMapper.java

@@ -31,13 +31,15 @@ public interface TaHousingResourcesMapper extends BaseMapper<TaHousingResources>
      * @param startPrice
      * @param endPrice
      * @param apartmentId
+     * @param type         为1只展示已发布的房源
      * @return
      */
     List<TaHousingResourcesPO> listHousingResources(@Param("orgId") Integer orgId,
-                                                     @Param("salesBatchId") String salesBatchId,
-                                                     @Param("startPrice") String startPrice,
-                                                     @Param("endPrice") String endPrice,
-                                                     @Param("apartmentId") String apartmentId);
+                                                    @Param("salesBatchId") String salesBatchId,
+                                                    @Param("startPrice") String startPrice,
+                                                    @Param("endPrice") String endPrice,
+                                                    @Param("apartmentId") String apartmentId,
+                                                    @Param("type") Integer type);
 
     /**
      * 获取某销售批次下所有房源户型
@@ -75,6 +77,7 @@ public interface TaHousingResourcesMapper extends BaseMapper<TaHousingResources>
 
     /**
      * 分页获取数据
+     *
      * @param pg
      * @param salesBatchId
      * @param buildingId

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

@@ -26,9 +26,10 @@ public interface ITaHousingResourcesService extends IService<TaHousingResources>
      * @param startPrice
      * @param endPrice
      * @param apartmentId
+     * @param type  为1只展示已发布的房源
      * @return
      */
-    List<TaHousingResourcesPO> listHousingResources(Integer orgId, String salesBatchId, String startPrice, String endPrice, String apartmentId);
+    List<TaHousingResourcesPO> listHousingResources(Integer orgId, String salesBatchId, String startPrice, String endPrice, String apartmentId, Integer type);
 
     /**
      * 获取某销售批次下所有房源户型
@@ -104,6 +105,7 @@ public interface ITaHousingResourcesService extends IService<TaHousingResources>
 
     /**
      * 保存文件
+     *
      * @param file
      * @param salesBatchId
      * @param buildingId

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

@@ -87,18 +87,19 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
      * @param startPrice
      * @param endPrice
      * @param apartmentId
+     * @param type
      * @return
      */
     @Override
-    public List<TaHousingResourcesPO> listHousingResources(Integer orgId, String salesBatchId, String startPrice, String endPrice, String apartmentId) {
-        logger.info("listHousingResources 接收参数：orgId：{},salesBatchId：{},startPrice：{},endPrice：{},apartmentId：{}",
-                orgId, salesBatchId, startPrice, endPrice, apartmentId);
+    public List<TaHousingResourcesPO> listHousingResources(Integer orgId, String salesBatchId, String startPrice, String endPrice, String apartmentId, Integer type) {
+        logger.info("listHousingResources 接收参数：orgId：{},salesBatchId：{},startPrice：{},endPrice：{},apartmentId：{}，type：{}",
+                orgId, salesBatchId, startPrice, endPrice, apartmentId, type);
 
         startPrice = StringUtils.isEmpty(startPrice) ? null : startPrice;
         endPrice = StringUtils.isEmpty(endPrice) ? null : endPrice;
 
         List<TaHousingResourcesPO> resourcesPOList =
-                taHousingResourcesMapper.listHousingResources(orgId, salesBatchId, startPrice, endPrice, apartmentId);
+                taHousingResourcesMapper.listHousingResources(orgId, salesBatchId, startPrice, endPrice, apartmentId, type);
 
         return resourcesPOList;
     }

src/main/resources/mapper/TaHousingResourcesMapper.xml

@@ -54,6 +54,7 @@
         LEFT JOIN ta_building_block t3 ON t.block_id = t3.block_id
         WHERE
             t.sales_batch_id = #{salesBatchId}
+            AND t.org_id = #{orgId}
             <choose>
                 <when test=" endPrice != null and startPrice == null">
                     AND t.price &lt;= #{endPrice}
@@ -70,8 +71,15 @@
             <if test="apartmentId != null and apartmentId != ''">
                 AND t.apartment_id = #{apartmentId}
             </if>
-            AND t.org_id = #{orgId}
-            AND t.`status` > 0
+            <choose>
+                <when test="type == 1">
+                    AND t.`status` > 0
+                </when>
+                <otherwise>
+                    AND t.`status` > -1
+                </otherwise>
+            </choose>
+
           ) t5
         ORDER BY
             t5.termNamePre,

src/main/resources/mapper/TaPreselectionRecordMapper.xml

@@ -52,6 +52,7 @@
     </select>
 
     <select id="selectPreSelectRecordList" resultType="com.huiju.estateagents.po.TaPreselectionRecordPO">
+        select * from (
         select t.house_id,
         a.block_name,
         a.unit_name,
@@ -68,17 +69,18 @@
         t.building_id,
         t.sales_batch_id,
         e.apartment_name,
+        b.person_id,
         (select name from ta_person t where (t.user_id = t.update_user || t.person_id = t.update_user)) as updateName
         from ta_preselection_record t
         left join ta_housing_resources a on t.house_id = a.house_id
         left join ta_person b on t.person_id = b.person_id
         LEFT JOIN ta_building_apartment e ON a.apartment_id = e.apartment_id
         where b.org_id = #{orgId} and a.sales_batch_id = #{salesBatchId}
-        <if test="houseId != null and houseId !=''">
-          and t.house_id = #{houseId}
+        <if test="houseId != null and houseId !=''">and t.house_id = #{houseId}
         </if>
         <if test="phone != null and phone != ''">
-          and b.phone = #{phone}
+            and b.
+            phone = #{phone}
         </if>
         <if test="apartmentId != null and apartmentId != ''">
           and a.apartment_id = #{apartmentId}
@@ -86,6 +88,7 @@
         <if test="status != null">
           and t.status = #{status}
         </if>
+        order by t.create_date desc) t group by t.house_id, t.person_id
     </select>
 
 </mapper>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -111,13 +111,13 @@ FROM
         SELECT
         a.*,
         a.customer_id AS customerId,
-        if(b.NAME  = null, d.name, b.name) as consultantName,
-        if(b.tel  = null, d.tel, b.tel) AS consultTel,
+        IFNULL(d.user_name, b.name) as consultantName,
+        IFNULL(d.phone, b.tel) as consultTel,
         c.building_name as intentionName
         FROM
         ta_recommend_customer a
         LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
-        LEFT JOIN ta_person d on a.realty_consultant = d.user_id
+        LEFT JOIN ta_user d on a.realty_consultant = d.user_id
         LEFT JOIN ta_building c ON a.building_id = c.building_id
         <where>
             a.status > 0
@@ -135,10 +135,10 @@ FROM
                 and a.phone like concat(concat("%",#{tel}),"%")
             </if>
             <if test="consultName != null and consultName !=''">
-                and b.name like CONCAT('%',#{consultName}, '%')
+                and IFNULL(d.user_name, b.name) like CONCAT('%',#{consultName}, '%')
             </if>
             <if test="consultTel != null and consultTel !=''">
-                and b.tel = #{consultTel}
+                and IFNULL(d.phone, b.tel) = #{consultTel}
             </if>
             <if test="entryType != null and entryType !=''">
                 and a.entry_type = #{entryType}
@@ -377,11 +377,12 @@ FROM
         a.phone as phone,
         c.building_name as intentionName,
         if(a.sex = 1, '男',if(a.sex = 2, '女', '未知')) as sex,
-        b.NAME AS consultantName,
-        b.tel AS consultTel
+        IFNULL(d.user_name, b.name) as consultantName,
+        IFNULL(d.phone, b.tel) as consultTel
         FROM
         ta_recommend_customer a
         LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
+        LEFT JOIN ta_user d on a.realty_consultant = d.user_id
         LEFT JOIN ta_building c ON a.building_id = c.building_id
         <where>
             a.status > 0
@@ -399,10 +400,10 @@ FROM
                 and a.phone like concat(concat("%",#{tel}),"%")
             </if>
             <if test="consultName != null and consultName !=''">
-                and b.name like CONCAT('%',#{consultName}, '%')
+                and IFNULL(d.user_name, b.name) like CONCAT('%',#{consultName}, '%')
             </if>
             <if test="consultTel != null and consultTel !=''">
-                and b.tel = #{consultTel}
+                and IFNULL(d.phone, b.tel) = #{consultTel}
             </if>
             <if test="entryType != null and entryType !=''">
                 and a.entry_type = #{entryType}

src/main/resources/mapper/TaShareCountMapper.xml

@@ -66,6 +66,7 @@
                 when d.`name` != null || d.name != '' then d.`name`
                 when e.building_name != null || e.building_name != '' then e.building_name
                 when f.news_name != null || f.news_name != '' then f.news_name
+                when h.sales_batch_name != null || h.sales_batch_name !='' then h.sales_batch_name
                 when a.`name` != null || a.`name` != '' then a.`name`
                 else '空'
                 end as shareTitle,
@@ -82,7 +83,7 @@
                 LEFT JOIN ta_drainage d on t.target_id = d.drainage_id and t.target_type = 'h5_share'
                 left join ta_building e on t.target_id = e.building_id and t.target_type = 'building_share'
                 LEFT JOIN ta_news f on t.target_id = f.news_id and t.target_type = 'news_share'
-
+                left join ta_sales_batch h on t.target_id = h.sales_batch_id and t.target_type = 'house_share'
         LEFT JOIN ta_person a ON t.share_person = a.person_id
         LEFT JOIN ta_person y on t.share_person = y.user_id
         LEFT JOIN ta_person z ON t.person_id = z.person_id
@@ -104,6 +105,7 @@
             e.building_name like CONCAT('%', #{shareTitle} , '%') or
             f.news_name like CONCAT('%', #{shareTitle} , '%') or
             a.`name` like CONCAT('%', #{shareTitle} , '%')
+            h.sales_batch_name like like CONCAT('%', #{shareTitle} , '%')
             )
         </if>
         GROUP BY

src/main/resources/mapper/TaSharePersonFromMapper.xml

@@ -39,7 +39,14 @@
             and c.person_Type = #{personType}
         </if>
         <if test="sceneType != null and sceneType != ''">
-            and b.scene_type = #{sceneType}
+            <choose>
+                <when test="sceneType == 'share'">
+                    and b.scene_type like CONCAT('%', #{sceneType})
+                </when>
+                <otherwise>
+                    and b.scene_type = #{sceneType}
+                </otherwise>
+            </choose>
         </if>
         <if test="phone != null and phone != ''">
             and c.phone = #{phone}