修改代码冲突的问题

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/AlarmServiceImpl.java

@@ -1,22 +1,21 @@
 package com.ylx.massage.service.impl;
-
-
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ylx.base.BaseServiceImpl;
 import com.ylx.common.core.domain.model.WxLoginUser;
 import com.ylx.common.exception.ServiceException;
 import com.ylx.common.utils.DateUtils;
 import com.ylx.massage.domain.Alarm;
+import com.ylx.massage.domain.vo.AlarmListVO;
 import com.ylx.massage.mapper.AlarmMapper;
 import com.ylx.massage.service.AlarmService;
 import com.ylx.order.domain.TOrder;
 import com.ylx.order.domain.dto.AlarmSubmitDTO;
 import com.ylx.order.service.TOrderService;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -38,15 +37,17 @@ public class AlarmServiceImpl extends BaseServiceImpl<AlarmMapper, Alarm> implem
     private TOrderService orderService;
 
     @Override
-    public Alarm queryById(String id) {
-        return null;
+    public Page<AlarmListVO> selectAlarmPage(Page<AlarmListVO> page, Alarm alarm) {
+        Alarm query = buildAlarmPageQuery(alarm);
+        return baseMapper.selectAlarmPage(page, query);
     }
 
     @Override
-    public Page<Alarm> queryByPage(Alarm alarm, PageRequest pageRequest) {
+    public Alarm queryById(String id) {
         return null;
     }
 
+
     @Override
     public Alarm update(Alarm alarm) {
         return null;
@@ -90,4 +91,35 @@ public class AlarmServiceImpl extends BaseServiceImpl<AlarmMapper, Alarm> implem
 
         return super.save(alarm);
     }
+
+    private Alarm buildAlarmPageQuery(Alarm alarm) {
+        Alarm query = new Alarm();
+        if (alarm == null) {
+            return query;
+        }
+        query.setMerchantName(alarm.getMerchantName());
+        query.setMerchantNickName(alarm.getMerchantNickName());
+        query.setMerchantSex(alarm.getMerchantSex());
+        query.setMerchantPhone(alarm.getMerchantPhone());
+        query.setAlarmStatus(alarm.getAlarmStatus());
+        query.setBeginTime(normalizeBeginTime(alarm.getBeginTime()));
+        query.setEndTime(normalizeEndTime(alarm.getEndTime()));
+        return query;
+    }
+
+    private String normalizeBeginTime(String beginTime) {
+        if (StringUtils.isBlank(beginTime)) {
+            return null;
+        }
+        String value = beginTime.trim();
+        return value.length() == 10 ? value + " 00:00:00" : value;
+    }
+
+    private String normalizeEndTime(String endTime) {
+        if (StringUtils.isBlank(endTime)) {
+            return null;
+        }
+        String value = endTime.trim();
+        return value.length() == 10 ? value + " 23:59:59" : value;
+    }
 }