* 增加获取提示消息接口

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

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.common;
 
+import java.time.Duration;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -39,13 +40,68 @@ public class DateUtils {
     }
 
     public static boolean checkTimeRange(LocalDateTime start, LocalDateTime end, LocalDateTime dt) {
-        if(dt == null){
+        if (dt == null) {
             dt = LocalDateTime.now();
         }
 
-        if(dt.isAfter(start) && dt.isBefore(end)){
+        if (dt.isAfter(start) && dt.isBefore(end)) {
             return true;
         }
         return false;
     }
+
+    /**
+     * 当前时间是否早于指定时间
+     *
+     * @param target
+     * @return
+     */
+    public static boolean isBefore(String target) {
+        LocalDateTime dt = LocalDateTime.now();
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        LocalDateTime targetTime = LocalDateTime.parse(target, df);
+        if (dt.isBefore(targetTime)) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 当前时间是否晚于指定时间
+     *
+     * @param target
+     * @return
+     */
+    public static boolean isAfter(String target) {
+        LocalDateTime dt = LocalDateTime.now();
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        LocalDateTime targetTime = LocalDateTime.parse(target, df);
+        if (dt.isAfter(targetTime)) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 获取时间差
+     *
+     * @param dt1
+     * @param dt2 目标时间
+     * @return
+     */
+    public static String diffTime(LocalDateTime dt1, LocalDateTime dt2) {
+        Duration duration = Duration.between(dt1, dt2);
+        long minutes = duration.toMinutes();
+        int hours = (int) Math.floor(minutes / 60);
+        int minute = (int) minutes % 60;
+        int day = (int) Math.floor(hours / 24);
+        int hour = hours % 24;
+
+        return day + "天" + hour + "小时" + minute + "分钟";
+    }
+
+    public static LocalDateTime timeToLocalDateTime(String target){
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        return LocalDateTime.parse(target, df);
+    }
 }

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

@@ -219,6 +219,7 @@ public class TaHousingResourcesController extends BaseController {
                                              HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
+        orgId = 25;
         try {
             responseBean.addSuccess(iTaHousingResourcesService.listHousingResources(orgId, salesBatchId, startPrice, endPrice, apartmentId));
         } catch (Exception e) {

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

@@ -92,17 +92,18 @@ public class TaSalesBatchController extends BaseController {
 
     /**
      * 删除批次
+     *
      * @param taSalesBatch 实体对象
      * @return
      */
-    @RequestMapping(value="/admin/taSalesBatch",method= RequestMethod.PUT)
-    public ResponseBean taSalesBatchDel(@RequestBody List<TaSalesBatch> salesBatchs, HttpServletRequest request){
+    @RequestMapping(value = "/admin/taSalesBatch", method = RequestMethod.PUT)
+    public ResponseBean taSalesBatchDel(@RequestBody List<TaSalesBatch> salesBatchs, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean = iTaSalesBatchService.delSalesBatchList(getOrgId(request), salesBatchs);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taSalesBatchAdd -=- {}",e.toString());
+            logger.error("taSalesBatchAdd -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -180,11 +181,11 @@ public class TaSalesBatchController extends BaseController {
      *
      * @param id 实体ID
      */
-    @RequestMapping(value = "/wx/taSalesBatch/{id}", method = RequestMethod.GET)
-    public ResponseBean taSalesBatchGetForMiniApp(@PathVariable Integer id) {
+    @RequestMapping(value = "/wx/getNoticeInfo/{id}", method = RequestMethod.GET)
+    public ResponseBean getNoticeInfo(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iTaSalesBatchService.getById(id));
+            responseBean = iTaSalesBatchService.getNoticeInfo(id);
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taSalesBatchGetForMiniApp -=- {}", e.toString());

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

@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -22,6 +23,7 @@ public interface TaSalesBatchMapper extends BaseMapper<TaSalesBatch> {
 
     /**
      * 根据批次号统计预选数据
+     *
      * @param orgId
      * @param taSalesBatchList
      * @return
@@ -29,4 +31,12 @@ public interface TaSalesBatchMapper extends BaseMapper<TaSalesBatch> {
     Integer countPreSelectRecord(@Param("orgId") Integer orgId, @Param("taSalesBatchList") List<TaSalesBatch> taSalesBatchList);
 
     void updateSalesBatchStatus(@Param("orgId") Integer orgId, @Param("taSalesBatchList") List<TaSalesBatch> taSalesBatchList);
+
+    /**
+     * 获取房源总数和总热度
+     *
+     * @param salesBatchId
+     * @return
+     */
+    Map<String,Long> getTotalHousesAndHeat(@Param("salesBatchId") Integer salesBatchId);
 }

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

@@ -20,4 +20,12 @@ public interface ITaSalesBatchService extends IService<TaSalesBatch> {
     IPage<TaSalesBatch> selectByCondition(IPage<TaSalesBatch> page, String salesBatchName, String buildingId, Integer status, Integer orgId);
 
     ResponseBean delSalesBatchList(Integer orgId, List<TaSalesBatch> taSalesBatchList);
+
+    /**
+     * 获取通知信息
+     *
+     * @param salesBatchId  销售批次ID
+     * @return
+     */
+    ResponseBean getNoticeInfo(Integer salesBatchId);
 }

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

@@ -4,13 +4,20 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 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.DateUtils;
 import com.huiju.estateagents.entity.TaSalesBatch;
 import com.huiju.estateagents.mapper.TaSalesBatchMapper;
 import com.huiju.estateagents.service.ITaSalesBatchService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -23,6 +30,8 @@ import java.util.List;
 @Service
 public class TaSalesBatchServiceImpl extends ServiceImpl<TaSalesBatchMapper, TaSalesBatch> implements ITaSalesBatchService {
 
+    private Logger logger = LoggerFactory.getLogger(TaSalesBatchServiceImpl.class);
+
     @Autowired
     private TaSalesBatchMapper taSalesBatchMapper;
 
@@ -35,11 +44,64 @@ public class TaSalesBatchServiceImpl extends ServiceImpl<TaSalesBatchMapper, TaS
     public ResponseBean delSalesBatchList(Integer orgId, List<TaSalesBatch> taSalesBatchList) {
         ResponseBean responseBean = new ResponseBean();
         Integer count = taSalesBatchMapper.countPreSelectRecord(orgId, taSalesBatchList);
-        if (count > 0){
+        if (count > 0) {
             responseBean.addError("已有用户预选，请先删除预选记录。");
             return responseBean;
         }
         taSalesBatchMapper.updateSalesBatchStatus(orgId, taSalesBatchList);
         return responseBean;
     }
+
+    /**
+     * 获取通知信息
+     *
+     * @param salesBatchId 销售批次ID
+     * @return
+     */
+    @Override
+    public ResponseBean getNoticeInfo(Integer salesBatchId) {
+        logger.info("getNoticeInfo 接收参数：saleBatchId：{}", salesBatchId);
+
+        ResponseBean responseBean = new ResponseBean();
+
+        TaSalesBatch salesBatch = getById(salesBatchId);
+        if (salesBatch == null) {
+            responseBean.addError("未查询到数据");
+            return responseBean;
+        }
+
+        List<String> noticeList = new ArrayList<>();
+        // 当前时间万余预选结束时间
+        if (DateUtils.isAfter(salesBatch.getPreselectionEndTime())) {
+            noticeList.add("预选已结束，请关注下轮预选");
+            responseBean.addSuccess(noticeList);
+            return responseBean;
+        }
+
+        // 当前时间早于预选开始时间
+        if (DateUtils.isBefore(salesBatch.getPreselectionStartTime())) {
+            String str = DateUtils.diffTime(DateUtils.timeToLocalDateTime(salesBatch.getPreselectionStartTime()), LocalDateTime.now());
+            noticeList.add("距离预选开始还有" + str);
+            responseBean.addSuccess(noticeList);
+            return responseBean;
+        }
+
+        // 当前时间在预选时间内
+        if (DateUtils.isAfter(salesBatch.getPreselectionStartTime()) && DateUtils.isBefore(salesBatch.getPreselectionEndTime())) {
+            String str = DateUtils.diffTime(LocalDateTime.now(), DateUtils.timeToLocalDateTime(salesBatch.getPreselectionEndTime()));
+            noticeList.add("距离预选结束还有" + str);
+        }
+
+        // 获取房源预选数量
+        Map<String, Long> result = taSalesBatchMapper.getTotalHousesAndHeat(salesBatchId);
+        if (result != null) {
+            Long totalHouses = result.get("totalHouses");
+            Long totalRealHeat = result.get("totalRealHeat");
+            if (totalRealHeat != null && totalRealHeat > 0) {
+                noticeList.add("当前" + totalHouses + "套房源已有" + totalRealHeat + "人成功预选 ");
+            }
+        }
+        responseBean.addSuccess(noticeList);
+        return responseBean;
+    }
 }

src/main/resources/mapper/TaSalesBatchMapper.xml

@@ -33,4 +33,14 @@
           #{taSalesBatch.salesBatchId}
       </foreach>
     </select>
+
+    <select id="getTotalHousesAndHeat" resultType="java.util.Map">
+        SELECT
+            count( * ) totalHouses,
+            sum( t.real_heat ) totalRealHeat
+        FROM
+            ta_housing_resources t
+        WHERE
+            t.STATUS = 1 and t.sales_batch_id = #{salesBatchId}
+    </select>
 </mapper>