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

# Conflicts:
#	src/main/java/com/huiju/estateagents/service/impl/TaSalesBatchServiceImpl.java

src/main/java/com/huiju/estateagents/po/BuildingImgPO.java

@@ -0,0 +1,31 @@
+package com.huiju.estateagents.po;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Auther: gusy
+ * @Date: 2020/2/19 16:24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class BuildingImgPO {
+
+    /**
+     * 是否全景图，1是
+     */
+    private Integer type;
+
+    /**
+     * 图片链接
+     */
+    private String url;
+
+    /**
+     * 全景图链接
+     */
+    private String panoramaLink;
+
+}

src/main/java/com/huiju/estateagents/po/TaHousingResourcesPO.java

@@ -2,6 +2,7 @@ package com.huiju.estateagents.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.huiju.estateagents.entity.TaBuildingImg;
+import com.huiju.estateagents.entity.TaBuildingPanorama;
 import com.huiju.estateagents.entity.TaHousingResources;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -48,7 +49,7 @@ public class TaHousingResourcesPO extends TaHousingResources {
      * 户型图片列表
      */
     @TableField(exist = false)
-    private List<TaBuildingImg> buildingImgList;
+    private List<BuildingImgPO> buildingImgList;
 
     /**
      * 楼盘名称

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

@@ -13,6 +13,7 @@ import com.huiju.estateagents.mapper.TaApartmentImgMapper;
 import com.huiju.estateagents.mapper.TaBuildingImgMapper;
 import com.huiju.estateagents.mapper.TaHousingResourcesMapper;
 import com.huiju.estateagents.mapper.TaPreselectionRecordMapper;
+import com.huiju.estateagents.po.BuildingImgPO;
 import com.huiju.estateagents.po.TaHousingResourcesPO;
 import com.huiju.estateagents.service.ITaHousingResourcesService;
 import org.apache.commons.collections.CollectionUtils;
@@ -79,6 +80,9 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
     @Autowired
     TaApartmentImgMapper taApartmentImgMapper;
 
+    @Autowired
+    private TaBuildingPanoramaMapper taBuildingPanoramaMapper;
+
 
     /**
      * 分页获取房源列表
@@ -168,24 +172,52 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
             resourcesPO.setIsPreselect(false);
         }
 
-        // 获取户型图片列表
-        List<TaBuildingImg> taBuildingImgList = new ArrayList<>();
-        List<TaApartmentImg> buildingImg;
-        QueryWrapper<TaBuildingImg> buildingImgQueryWrapper;
-        QueryWrapper<TaApartmentImg> apartmentImgQueryWrapper = new QueryWrapper<>();
-        apartmentImgQueryWrapper.eq("apartment_id", resourcesPO.getApartmentId());
-        buildingImg = taApartmentImgMapper.selectList(apartmentImgQueryWrapper);
-        for (TaApartmentImg apartmentImg : buildingImg) {
-            buildingImgQueryWrapper = new QueryWrapper<>();
-            buildingImgQueryWrapper.eq("img_id", apartmentImg.getImgId());
-            buildingImgQueryWrapper.eq("img_type", CommConstant.BUILDING_IMG_APARMENT);
-            buildingImgQueryWrapper.orderByAsc("order_no");
-            taBuildingImgList = taBuildingImgMapper.selectList(buildingImgQueryWrapper);
-        }
-        if (CollectionUtils.isNotEmpty(taBuildingImgList)) {
-            resourcesPO.setBuildingImgList(taBuildingImgList);
+        List<BuildingImgPO> buildingImgPOList = new ArrayList<>();
+        BuildingImgPO buildingImgPO;
+        if (!StringUtils.isEmpty(resourcesPO.getApartmentId())) {
+            // 获取全景图
+            QueryWrapper<TaBuildingPanorama> buildingPanoramaQueryWrapper = new QueryWrapper<>();
+            buildingPanoramaQueryWrapper.eq("org_id", resourcesPO.getOrgId());
+            buildingPanoramaQueryWrapper.eq("building_id", resourcesPO.getBuildingId());
+            buildingPanoramaQueryWrapper.eq("apartment_id", resourcesPO.getApartmentId());
+            buildingPanoramaQueryWrapper.eq("panorama_type", "apartment");
+            buildingPanoramaQueryWrapper.eq("status", "1");
+            List<TaBuildingPanorama> panoramaList = taBuildingPanoramaMapper.selectList(buildingPanoramaQueryWrapper);
+            if (CollectionUtils.isNotEmpty(panoramaList)) {
+                for (TaBuildingPanorama panorama : panoramaList) {
+                    buildingImgPO = new BuildingImgPO();
+                    buildingImgPO.setUrl(panorama.getCoverImg());
+                    buildingImgPO.setType(1);
+                    buildingImgPO.setPanoramaLink(panorama.getPanoramaLink());
+                    buildingImgPOList.add(buildingImgPO);
+                }
+            }
+
+            // 获取户型图片列表
+            List<TaBuildingImg> taBuildingImgList = new ArrayList<>();
+            List<TaApartmentImg> buildingImg;
+            QueryWrapper<TaBuildingImg> buildingImgQueryWrapper;
+            QueryWrapper<TaApartmentImg> apartmentImgQueryWrapper = new QueryWrapper<>();
+            apartmentImgQueryWrapper.eq("apartment_id", resourcesPO.getApartmentId());
+            buildingImg = taApartmentImgMapper.selectList(apartmentImgQueryWrapper);
+            for (TaApartmentImg apartmentImg : buildingImg) {
+                buildingImgQueryWrapper = new QueryWrapper<>();
+                buildingImgQueryWrapper.eq("img_id", apartmentImg.getImgId());
+                buildingImgQueryWrapper.eq("img_type", CommConstant.BUILDING_IMG_APARMENT);
+                buildingImgQueryWrapper.orderByAsc("order_no");
+                taBuildingImgList = taBuildingImgMapper.selectList(buildingImgQueryWrapper);
+            }
+            if (CollectionUtils.isNotEmpty(taBuildingImgList)) {
+                for (TaBuildingImg img : taBuildingImgList) {
+                    buildingImgPO = new BuildingImgPO();
+                    buildingImgPO.setType(0);
+                    buildingImgPO.setUrl(img.getUrl());
+                    buildingImgPOList.add(buildingImgPO);
+                }
+            }
         }
 
+        resourcesPO.setBuildingImgList(buildingImgPOList);
         return resourcesPO;
     }
 

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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.TaPosterMapper;
@@ -85,8 +86,16 @@ public class TaSalesBatchServiceImpl extends ServiceImpl<TaSalesBatchMapper, TaS
             taBuildingRoom.setStatus(CommConstant.STATUS_DELETE);
             taBuildingRoomList.add(taBuildingRoom);
         });
-        taBuildingRoomService.updateBatchById(taBuildingRoomList);
-        taHousingResourcesService.updateBatchById(housingList);
+
+        //房源改为无效
+        if (CollectionUtils.isNotEmpty(housingList)){
+            taHousingResourcesService.updateBatchById(housingList);
+        }
+
+        if (CollectionUtils.isNotEmpty(taBuildingRoomList)){
+            taBuildingRoomService.updateBatchById(taBuildingRoomList);
+        }
+
         //删除销售批次
         taSalesBatchMapper.updateSalesBatchStatus(orgId, taSalesBatchList);
         return responseBean;

src/main/resources/mapper/TaPreselectionRecordMapper.xml

@@ -69,8 +69,7 @@
         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
+        b.person_id
         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

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -170,12 +170,12 @@ FROM
         FROM
         ta_recommend_customer a
         LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
-        LEFT JOIN ta_person c on a.recommend_person = c.person_id
         LEFT JOIN ta_user d on d.user_id = a.realty_consultant
         LEFT JOIN ta_person_from_record p ON a.person_id = p.person_id AND p.is_first_time = 1
         <if test="orgId != null">
             and p.org_id =  #{orgId}
         </if>
+        LEFT JOIN ta_person c on p.share_person_id = c.person_id
         LEFT JOIN td_wx_dict w ON p.scene_id = w.scene_id
         <where>
             a.status > 0

src/main/resources/mapper/TaShareCountMapper.xml

@@ -67,7 +67,7 @@
                 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`
+                WHEN y.`name` != NULL || y.`name` != '' THEN y.`name`
                 else '空'
                 end as shareTitle,
                         z.phone as personPhone,

src/main/resources/mapper/TaShareMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.huiju.estateagents.mapper.TaShareMapper">
 
     <select id="selectHouseShareList" resultType="com.huiju.estateagents.entity.TaShare">
-      select a.avatarurl as photoOravatar, a.nickname as nameOrnick, a.name, a.phone, a.person_type, t.tagert_type, t.create_date From ta_share t
+      select a.avatarurl as photoOravatar, a.nickname as nameOrnick, a.name, a.phone, a.person_type, t.tagert_type, t.create_date From ta_share_count t
       left join ta_person a on t.person_id = a.person_id
       left join ta_sales_batch b on t.be_share = b.sales_batch_id
       where a.org_id = #{orgId}

src/main/resources/mapper/TaSharePersonFromMapper.xml

@@ -31,10 +31,9 @@
         left join td_wx_dict b on a.scene_id = b.scene_id
         left join ta_person c on t.person_id = c.person_id
         left join ta_housing_resources d on d.house_id = t.target_id
-        left join ta_sales_batch z on t.target_id = z.sales_batch_id
         where a.org_id = #{orgId}
         and t.target_type = 'house_share'
-        and z.sales_batch_id = #{saleBatchId}
+        and t.target_id = #{saleBatchId}
         <if test="personType != null and personType != ''">
             and c.person_Type = #{personType}
         </if>