* 代码优化

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

@@ -1,10 +1,9 @@
 package com.huiju.estateagents.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 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;
@@ -13,9 +12,6 @@ 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;
 
@@ -70,38 +66,22 @@ public class TaSalesBatchServiceImpl extends ServiceImpl<TaSalesBatchMapper, TaS
             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);
-        }
+        Long totalHouses = null;
+        Long totalRealHeat = null;
 
         // 获取房源预选数量
         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 + "人成功预选 ");
-            }
+            totalHouses = result.get("totalHouses");
+            totalRealHeat = result.get("totalRealHeat");
         }
-        responseBean.addSuccess(noticeList);
+
+        JSONObject obj = new JSONObject();
+        obj.put("preselectionStartTime", salesBatch.getPreselectionStartTime());
+        obj.put("preselectionEndTime", salesBatch.getPreselectionEndTime());
+        obj.put("salesNumber", totalHouses == null ? 0 : totalHouses);
+        obj.put("preselectionNumber", totalRealHeat == null ? 0 : totalRealHeat);
+        responseBean.addSuccess(obj);
         return responseBean;
     }
 }