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

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

@@ -529,6 +529,11 @@ public class CommConstant {
      */
     public static final String HOUSE = "house";
 
+    /**
+     * 直播分享
+     */
+    public static final String LIVE = "live";
+
     /**
      * 系统参数  通知消息次时间间隔
      */

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

@@ -2,9 +2,11 @@ package com.huiju.estateagents.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.api.R;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaLiveActivity;
 import com.huiju.estateagents.service.ITaLiveActivityService;
 import org.slf4j.Logger;
@@ -13,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -94,7 +97,12 @@ public class TaLiveActivityController extends BaseController {
     public ResponseBean taLiveActivityDelete(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaLiveActivityService.removeById(id)) {
+            TaLiveActivity taLiveActivity = new TaLiveActivity();
+            taLiveActivity.setLiveActivityId(id);
+            taLiveActivity.setStatus(CommConstant.STATUS_UNACCALIMED);
+            taLiveActivity.setUpdateDate(LocalDateTime.now());
+
+            if (iTaLiveActivityService.updateById(taLiveActivity)) {
                 responseBean.addSuccess("success");
             } else {
                 responseBean.addError("fail");
@@ -168,4 +176,23 @@ public class TaLiveActivityController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 获取直播详情
+     *
+     * @param id
+     * @return
+     */
+    @RequestMapping(value = "/wx/taLiveActivity/{id}", method = RequestMethod.GET)
+    public ResponseBean getLiveActivityDetailById(@PathVariable("id") String id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaLiveActivityService.getLiveActivityDetailById(id);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("getLiveActivityDetailById -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -109,8 +109,8 @@ public class TaSalesBatchController extends BaseController {
             shareContent.setTargetId(taSalesBatch.getSalesBatchId().toString());
             shareContent.setShareContentTitle("诚挚邀您在线选房购房~");
             shareContent.setShareContentImg(taSalesBatch.getAerialViewImg());
-            shareContent.setShareContentType("house");
-            shareContent.setStatus(1);
+            shareContent.setShareContentType(CommConstant.HOUSE);
+            shareContent.setStatus(CommConstant.STATUS_NORMAL);
             shareContent.setCreateDate(LocalDateTime.now());
             taShareContentService.save(shareContent);
 

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -8,6 +9,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -130,5 +132,11 @@ public class TaLiveActivity implements Serializable {
      */
     private Integer weight;
 
+    @TableField(exist = false)
+    private List<TaPoster> posters;
+
+    @TableField(exist = false)
+    private List<TaShareContent> shareContents;
+
 
 }

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

@@ -45,4 +45,12 @@ public interface ITaLiveActivityService extends IService<TaLiveActivity> {
      * @return
      */
     ResponseBean addVisitNum(String id);
+
+    /**
+     * 获取直播活动详情
+     *
+     * @param id
+     * @return
+     */
+    ResponseBean getLiveActivityDetailById(String id);
 }

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

@@ -7,14 +7,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.entity.TaLiveActivity;
-import com.huiju.estateagents.entity.TaMiniapp;
-import com.huiju.estateagents.entity.TaShareContent;
+import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.TaLiveActivityMapper;
-import com.huiju.estateagents.service.IMiniAppService;
-import com.huiju.estateagents.service.ITaLiveActivityService;
-import com.huiju.estateagents.service.ITaMiniappService;
-import com.huiju.estateagents.service.TaShareContentService;
+import com.huiju.estateagents.service.*;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +19,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <p>
@@ -48,6 +47,15 @@ public class TaLiveActivityServiceImpl extends ServiceImpl<TaLiveActivityMapper,
     @Autowired
     private TaLiveActivityMapper taLiveActivityMapper;
 
+    @Autowired
+    private TaPosterServiceImpl taPosterService;
+
+    @Autowired
+    private ShareContentServiceImpl shareContentService;
+
+    @Autowired
+    private TdPosterTemplateServiceImpl posterTemplateService;
+
 
     @Override
     public ResponseBean taLiveActivityAdd(TaLiveActivity taLiveActivity) {
@@ -83,8 +91,8 @@ public class TaLiveActivityServiceImpl extends ServiceImpl<TaLiveActivityMapper,
         shareContent.setTargetId(taLiveActivity.getLiveActivityId().toString());
         shareContent.setShareContentTitle("直播看房，在线答疑，快上车~");
         shareContent.setShareContentImg(taLiveActivity.getDetailImg());
-        shareContent.setShareContentType("live");
-        shareContent.setStatus(1);
+        shareContent.setShareContentType(CommConstant.LIVE);
+        shareContent.setStatus(CommConstant.STATUS_NORMAL);
         shareContent.setCreateDate(LocalDateTime.now());
         taShareContentService.save(shareContent);
 
@@ -102,11 +110,25 @@ public class TaLiveActivityServiceImpl extends ServiceImpl<TaLiveActivityMapper,
         ResponseBean responseBean = new ResponseBean();
         IPage<TaLiveActivity> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaLiveActivity> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like("live_activity_title", liveActivityTitle);
-        queryWrapper.eq("city_id", cityId);
-        queryWrapper.eq("building_id", buildingId);
-        queryWrapper.eq("live_detail_type", liveDetailType);
-        queryWrapper.eq("status", status);
+
+        if (orgId != null) {
+            queryWrapper.eq("org_id", orgId);
+        }
+        if (StringUtils.isNotBlank(liveActivityTitle)) {
+            queryWrapper.like("live_activity_title", liveActivityTitle);
+        }
+        if (StringUtils.isNotBlank(cityId)) {
+            queryWrapper.eq("city_id", cityId);
+        }
+        if (StringUtils.isNotBlank(buildingId)) {
+            queryWrapper.eq("building_id", buildingId);
+        }
+        if (StringUtils.isNotBlank(liveDetailType)) {
+            queryWrapper.eq("live_detail_type", liveDetailType);
+        }
+        if (status != null) {
+            queryWrapper.eq("status", status);
+        }
         queryWrapper.orderByDesc("create_date");
         IPage<TaLiveActivity> result = page(pg, queryWrapper);
         responseBean.addSuccess(result);
@@ -117,11 +139,51 @@ public class TaLiveActivityServiceImpl extends ServiceImpl<TaLiveActivityMapper,
     public ResponseBean addVisitNum(String id) {
         ResponseBean responseBean = new ResponseBean();
         Boolean result = taLiveActivityMapper.addVisitNum(id);
-        if(result){
+        if (result) {
             responseBean.addSuccess("成功");
             return responseBean;
         }
         responseBean.addError("fail");
         return responseBean;
     }
+
+    @Override
+    public ResponseBean getLiveActivityDetailById(String id) {
+        logger.info("getLiveActivityDetailById 接收参数：id：{}", id);
+
+        ResponseBean responseBean = new ResponseBean();
+        TaLiveActivity result = getById(id);
+        if (result == null) {
+            responseBean.addSuccess(null);
+            return responseBean;
+        }
+
+        // 获取海报信息
+        QueryWrapper<TaPoster> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("target_id", id + "");
+        queryWrapper.eq("target_type", CommConstant.LIVE);
+        queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+        List<TaPoster> posterList = taPosterService.list(queryWrapper);
+
+        List<TaPoster> resultPosterList = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(posterList)) {
+            for (TaPoster poster : posterList) {
+                QueryWrapper<TdPosterTemplate> templateQueryWrapper = new QueryWrapper<>();
+                templateQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+                templateQueryWrapper.eq("type ", "liveActivity");
+                List<TdPosterTemplate> posterTemplate = posterTemplateService.list(templateQueryWrapper);
+
+                poster.setTemplates(posterTemplate);
+                resultPosterList.add(poster);
+            }
+        }
+
+        // 获取分享内容信息
+        List<TaShareContent> shareContentList = shareContentService.getPostersForTarget(id + "", CommConstant.LIVE);
+
+        result.setPosters(resultPosterList);
+        result.setShareContents(shareContentList);
+        responseBean.addSuccess(result);
+        return responseBean;
+    }
 }

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

@@ -165,7 +165,7 @@ public class TaSalesBatchServiceImpl extends ServiceImpl<TaSalesBatchMapper, TaS
         // 获取楼盘名称
         TaBuilding taBuilding = taBuildingService.getById(result.getBuildingId());
         if(taBuilding != null){
-            taBuilding.setBuildingName(taBuilding.getName());
+            result.setBuildingName(taBuilding.getBuildingName());
         }
 
         // 获取海报信息