* 销售批次增加返回海报和分享内容

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

@@ -88,11 +88,11 @@ public class TaSalesBatchController extends BaseController {
             taSalesBatch.setUpdateTime(LocalDateTime.now());
             iTaSalesBatchService.save(taSalesBatch);
 
-            QueryWrapper<TaMiniapp> taMiniappQuery= new QueryWrapper<>();
-            taMiniappQuery.eq("org_id",getOrgId(request));
+            QueryWrapper<TaMiniapp> taMiniappQuery = new QueryWrapper<>();
+            taMiniappQuery.eq("org_id", getOrgId(request));
             TaMiniapp taMiniapp = taMiniappService.getOne(taMiniappQuery);
             // 生成二维码
-            ResponseBean taMiniappQrcode = miniAppService.getQrCode(CommConstant.HOUSE_QRCODE.replace("#0",taSalesBatch.getSalesBatchId().toString()).replace("#1","house"),taMiniapp.getMiniappId());
+            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);
             responseBean.addSuccess(taSalesBatch);
@@ -217,7 +217,7 @@ public class TaSalesBatchController extends BaseController {
     public ResponseBean taSalesBatchGetForMiniApp(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iTaSalesBatchService.getById(id));
+            responseBean = iTaSalesBatchService.getSalesBatchById(id);
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taSalesBatchGetForMiniApp -=- {}", e.toString());

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

@@ -9,6 +9,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -97,4 +98,10 @@ public class TaSalesBatch implements Serializable {
     @TableField(exist = false)
     private String buildingName;
 
+    @TableField(exist = false)
+    private List<TaPoster> posters;
+
+    @TableField(exist = false)
+    private List<TaShareContent> shareContents;
+
 }

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

@@ -24,8 +24,16 @@ public interface ITaSalesBatchService extends IService<TaSalesBatch> {
     /**
      * 获取通知信息
      *
-     * @param salesBatchId  销售批次ID
+     * @param salesBatchId 销售批次ID
      * @return
      */
     ResponseBean getNoticeInfo(Integer salesBatchId);
+
+    /**
+     * 获取销售批次详情
+     *
+     * @param salesBatchId
+     * @return
+     */
+    ResponseBean getSalesBatchById(Integer salesBatchId);
 }

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

@@ -1,10 +1,15 @@
 package com.huiju.estateagents.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.entity.TaPoster;
 import com.huiju.estateagents.entity.TaSalesBatch;
+import com.huiju.estateagents.entity.TaShareContent;
+import com.huiju.estateagents.mapper.TaPosterMapper;
 import com.huiju.estateagents.mapper.TaSalesBatchMapper;
 import com.huiju.estateagents.service.ITaSalesBatchService;
 import org.slf4j.Logger;
@@ -13,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -32,6 +38,12 @@ public class TaSalesBatchServiceImpl extends ServiceImpl<TaSalesBatchMapper, TaS
     @Autowired
     private TaSalesBatchMapper taSalesBatchMapper;
 
+    @Autowired
+    TaPosterMapper taPosterMapper;
+
+    @Autowired
+    private ShareContentServiceImpl shareContentService;
+
     @Override
     public IPage<TaSalesBatch> selectByCondition(IPage<TaSalesBatch> page, String salesBatchName, String buildingId, Integer status, Integer orgId) {
         return taSalesBatchMapper.selectByCondition(page, salesBatchName, buildingId, status, orgId);
@@ -74,15 +86,51 @@ public class TaSalesBatchServiceImpl extends ServiceImpl<TaSalesBatchMapper, TaS
         Map<String, Object> result = taSalesBatchMapper.getTotalHousesAndHeat(salesBatchId);
         if (result != null) {
             totalHouses = (Long) result.get("totalHouses");
-            totalRealHeat = (BigDecimal)result.get("totalRealHeat");
+            totalRealHeat = (BigDecimal) result.get("totalRealHeat");
         }
 
         JSONObject obj = new JSONObject();
         obj.put("preselectionStartTime", salesBatch.getPreselectionStartTime());
         obj.put("preselectionEndTime", salesBatch.getPreselectionEndTime());
-        obj.put("salesNumber", totalHouses == null ? 0:totalHouses);
+        obj.put("salesNumber", totalHouses == null ? 0 : totalHouses);
         obj.put("preselectionNumber", totalRealHeat == null ? 0 : totalRealHeat);
         responseBean.addSuccess(obj);
         return responseBean;
     }
+
+    /**
+     * 获取销售批次详情
+     *
+     * @param salesBatchId
+     * @return
+     */
+    @Override
+    public ResponseBean getSalesBatchById(Integer salesBatchId) {
+        logger.info("getSalesBatchById 接收参数：saleBatchId：{}", salesBatchId);
+
+        ResponseBean responseBean = new ResponseBean();
+        TaSalesBatch result = getById(salesBatchId);
+        if (result == null) {
+            responseBean.addSuccess(null);
+            return responseBean;
+        }
+
+        // 获取海报信息
+        QueryWrapper<TaPoster>queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("target_id",salesBatchId + "");
+        queryWrapper.eq("target_type","house");
+        queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+        TaPoster poster =taPosterMapper.selectOne(queryWrapper);
+
+        // 获取分享内容信息
+        List<TaShareContent> shareContentList = shareContentService.getPostersForTarget(salesBatchId + "", "house");
+
+        List<TaPoster> posterList = new ArrayList<>();
+        posterList.add(poster);
+
+        result.setPosters(posterList);
+        result.setShareContents(shareContentList);
+        responseBean.addSuccess(result);
+        return responseBean;
+    }
 }