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

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -473,4 +473,26 @@ public class CommConstant {
      * 客户统计类型：到访客户
      */
     public static final String CUSTOMER_TYPE_VISITE = "visite";
+
+    // =================   项目图片类型 ==============
+
+    /**
+     * 项目banner
+     */
+    public static final String BUILDING_IMG_BANNER = "banner";
+
+    /**
+     * 项目列表图
+     */
+    public static final String BUILDING_IMG_LIST = "list";
+
+    /**
+     * 视频封面图
+     */
+    public static final String BUILDING_IMG_VIDEOIMAGE = "videoImage";
+
+    /**
+     * 户型图
+     */
+    public static final String BUILDING_IMG_APARMENT = "aparment";
 }

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

@@ -203,6 +203,12 @@ public class TaBuilding implements Serializable {
      */
     private String mapJson;
 
+    /**
+     * 视频封面
+     */
+    @TableField(exist = false)
+    private List<TaBuildingImg> videoImage;
+
     /**
      * 图片
      */

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

@@ -3,8 +3,10 @@ package com.huiju.estateagents.service.impl;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Lists;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.DateUtils;
@@ -97,7 +99,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
                 //查询当前图片
                 QueryWrapper<TaBuildingImg> queryWrapper = new QueryWrapper<>();
                 queryWrapper.eq("building_id", taBuilding.getBuildingId());
-                queryWrapper.eq("img_type", "banner");
+                queryWrapper.eq("img_type", CommConstant.BUILDING_IMG_BANNER);
                 queryWrapper.orderByAsc("create_date");
 
                 List<TaBuildingImg> buildingImg = taBuildingImgMapper.selectList(queryWrapper);
@@ -120,6 +122,21 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         return ResponseBean.success(page);
     }
 
+    /**
+     * 查询项目图片
+     * @param buildingId
+     * @param imgType
+     * @return
+     */
+    private List<TaBuildingImg> getBuildingImg(String buildingId, String imgType) {
+        //查询当前图片
+        QueryWrapper<TaBuildingImg> BuildingImgQueryWrapper = new QueryWrapper<>();
+        BuildingImgQueryWrapper.eq("building_id", buildingId);
+        BuildingImgQueryWrapper.eq("img_type", imgType);
+        List<TaBuildingImg> buildingImg = taBuildingImgMapper.selectList(BuildingImgQueryWrapper);
+        return  buildingImg.size() > 0 ? buildingImg : null;
+    }
+
     @Override
     public ResponseBean buildingSelectId(String id) {
         // 查询基础信息
@@ -129,19 +146,13 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         TaBuilding building = taBuildingMapper.selectOne(buildingtWrapper);
 
         //查询当前图片
-        QueryWrapper<TaBuildingImg> BuildingImgQueryWrapper = new QueryWrapper<>();
-        BuildingImgQueryWrapper.eq("building_id", id);
-        BuildingImgQueryWrapper.eq("img_type", "banner");
-        List<TaBuildingImg> buildingImg = taBuildingImgMapper.selectList(BuildingImgQueryWrapper);
-        building.setBuildingImg(buildingImg);
+        building.setBuildingImg(getBuildingImg(id, CommConstant.BUILDING_IMG_BANNER));
 
         // 列表图
-        QueryWrapper<TaBuildingImg> BuildingListImgQueryWrapper = new QueryWrapper<>();
-        BuildingListImgQueryWrapper.eq("building_id", building.getBuildingId());
-        BuildingListImgQueryWrapper.eq("img_type", "list");
-        List<TaBuildingImg> buildingListImg = taBuildingImgMapper.selectList(BuildingListImgQueryWrapper);
-        building.setBuildingListImg(buildingListImg);
+        building.setBuildingListImg(getBuildingImg(building.getBuildingId(), CommConstant.BUILDING_IMG_LIST));
 
+        // 视频封面图
+        building.setVideoImage(getBuildingImg(building.getBuildingId(), CommConstant.BUILDING_IMG_VIDEOIMAGE));
 
         // 查询tag
         QueryWrapper<TaBuildingTag> BuildingTagQueryWrapper = new QueryWrapper<>();
@@ -169,11 +180,10 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         TaBuilding building = taBuildingMapper.selectOne(buildingtWrapper);
 
         //查询当前图片
-        QueryWrapper<TaBuildingImg> BuildingImgQueryWrapper = new QueryWrapper<>();
-        BuildingImgQueryWrapper.eq("building_id", id);
-        BuildingImgQueryWrapper.eq("img_type", "banner");
-        List<TaBuildingImg> buildingImg = taBuildingImgMapper.selectList(BuildingImgQueryWrapper);
-        building.setBuildingImg(buildingImg);
+        building.setBuildingImg(getBuildingImg(id, CommConstant.BUILDING_IMG_BANNER));
+
+        // 视频封面图
+        building.setVideoImage(getBuildingImg(building.getBuildingId(), CommConstant.BUILDING_IMG_VIDEOIMAGE));
 
         // 查询tag
         QueryWrapper<TaBuildingTag> BuildingTagQueryWrapper = new QueryWrapper<>();
@@ -250,6 +260,12 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         TaBuilding building = JSONObject.parseObject(parameter,TaBuilding.class);
 
+        // 先删除视频
+        UpdateWrapper<TaBuilding> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("building_id", building.getBuildingId());
+        updateWrapper.set("video_url", null);
+        this.update(updateWrapper);
+
         //图片先删除再添加
         String imgStr = object.getString("img");
         List<TaBuildingImg> buildingImgs = JSONObject.parseArray(imgStr, TaBuildingImg.class);
@@ -261,7 +277,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             taBuildingMapper.update(building,buildingIdQueryWrapper);
             QueryWrapper<TaBuildingImg> BuildingImgQueryWrapper = new QueryWrapper<>();
             BuildingImgQueryWrapper.eq("building_id", building.getBuildingId());
-            BuildingImgQueryWrapper.eq("img_type", "banner");
+            BuildingImgQueryWrapper.eq("img_type", CommConstant.BUILDING_IMG_BANNER);
             taBuildingImgMapper.delete(BuildingImgQueryWrapper);
             insertImgBatch(buildingImgs, building.getBuildingId());
         }
@@ -272,11 +288,22 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         if (CollectionUtils.isNotEmpty(buildingListImg)) {
             QueryWrapper<TaBuildingImg> BuildingListImgQueryWrapper = new QueryWrapper<>();
             BuildingListImgQueryWrapper.eq("building_id", building.getBuildingId());
-            BuildingListImgQueryWrapper.eq("img_type", "list");
+            BuildingListImgQueryWrapper.eq("img_type", CommConstant.BUILDING_IMG_LIST);
             taBuildingImgMapper.delete(BuildingListImgQueryWrapper);
             buildingListImg = insertImgBatch(buildingListImg, building.getBuildingId());
         }
 
+        // 视频封面图
+        String videoImage = object.getString("videoImage");
+        List<TaBuildingImg> videoImageList = JSONObject.parseArray(videoImage, TaBuildingImg.class);
+        if (CollectionUtils.isNotEmpty(videoImageList)) {
+            QueryWrapper<TaBuildingImg> BuildingListImgQueryWrapper = new QueryWrapper<>();
+            BuildingListImgQueryWrapper.eq("building_id", building.getBuildingId());
+            BuildingListImgQueryWrapper.eq("img_type", CommConstant.BUILDING_IMG_VIDEOIMAGE);
+            taBuildingImgMapper.delete(BuildingListImgQueryWrapper);
+            videoImageList = insertImgBatch(videoImageList, building.getBuildingId());
+        }
+
 
         // tag先删除再增加
         String tagStr = object.getString("tag");
@@ -347,6 +374,13 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             buildingImgs = insertImgBatch(buildingImgs, building.getBuildingId());
         }
 
+        // 视频封面图
+        String videoImage = object.getString("videoImage");
+        List<TaBuildingImg> videoImageList = JSONObject.parseArray(imgStr, TaBuildingImg.class);
+        if (CollectionUtils.isNotEmpty(videoImageList)) {
+            videoImageList = insertImgBatch(videoImageList, building.getBuildingId());
+        }
+
         // 列表图
         String listImg = object.getString("listImg");
         List<TaBuildingImg> buildingListImg = JSONObject.parseArray(listImg, TaBuildingImg.class);
@@ -474,7 +508,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         for (TaApartmentImg apartmentImg:buildingImg){
             QueryWrapper<TaBuildingImg> buildingImgQueryWrapper = new QueryWrapper<>();
             buildingImgQueryWrapper.eq("img_id",apartmentImg.getImgId());
-            buildingImgQueryWrapper.eq("img_type","aparment");
+            buildingImgQueryWrapper.eq("img_type",CommConstant.BUILDING_IMG_APARMENT);
             List<TaBuildingImg> buildingImgList= taBuildingImgMapper.selectList(buildingImgQueryWrapper);
             for (TaBuildingImg buImg:buildingImgList) {
                 arrayList.add(buImg);
@@ -532,11 +566,9 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
 
     private void getBuildingAttaches(TaBuilding build) {
-        QueryWrapper<TaBuildingImg> BuildingImgQueryWrapper = new QueryWrapper<>();
-        BuildingImgQueryWrapper.eq("building_id", build.getBuildingId());
-        BuildingImgQueryWrapper.eq("img_type", "banner");
-        List<TaBuildingImg> buildingImg = taBuildingImgMapper.selectList(BuildingImgQueryWrapper);
-        build.setBuildingImg(buildingImg);
+        build.setBuildingImg(getBuildingImg(build.getBuildingId(), CommConstant.BUILDING_IMG_BANNER));
+        build.setBuildingListImg(getBuildingImg(build.getBuildingId(), CommConstant.BUILDING_IMG_LIST));
+        build.setVideoImage(getBuildingImg(build.getBuildingId(), CommConstant.BUILDING_IMG_VIDEOIMAGE));
 
 //            QueryWrapper<Visit> BuildingVisitQueryWrapper = new QueryWrapper<>();
 //            BuildingVisitQueryWrapper.eq("visit_type", "building");
@@ -598,7 +630,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         // 楼盘Banner
         QueryWrapper<TaBuildingImg> buildingImgBannerQueryWrapper = new QueryWrapper<>();
         buildingImgBannerQueryWrapper.eq("building_id", building.getBuildingId());
-        buildingImgBannerQueryWrapper.eq("img_type", "banner");
+        buildingImgBannerQueryWrapper.eq("img_type", CommConstant.BUILDING_IMG_BANNER);
         buildingImgBannerQueryWrapper.orderBy(true, true, "order_no");
         List<TaBuildingImg> buildingBannerImg = taBuildingImgMapper.selectList(buildingImgBannerQueryWrapper);
 
@@ -640,7 +672,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             List<TaBuildingImg> buildingImag = buildingImg.stream().map(img -> {
                 QueryWrapper<TaBuildingImg> buildingImgQueryWrapper = new QueryWrapper<>();
                 buildingImgQueryWrapper.eq("img_id", img.getImgId());
-                buildingImgQueryWrapper.eq("img_type", "aparment");
+                buildingImgQueryWrapper.eq("img_type", CommConstant.BUILDING_IMG_APARMENT);
                 return taBuildingImgMapper.selectOne(buildingImgQueryWrapper);
             }).collect(Collectors.toList());
 

src/main/resources/mapper/TaShareRecordMapper.xml

@@ -179,6 +179,6 @@
     </select>
 
     <select id="countGroupBuyPeople" resultType="java.lang.Integer">
-        select count(1) From ta_share_record t where t.group_activity_id = #{groupActivityId} GROUP BY t.group_activity_id
+        select count(1) From ta_share_record t where t.status = '0' and t.group_activity_id = #{groupActivityId} GROUP BY t.group_activity_id
     </select>
 </mapper>