From e2a744307c3d5b5e2b58c1a64cf4b4827996c29b Mon Sep 17 00:00:00 2001 From: kongdeqiang <123456> Date: 星期一, 22 四月 2024 10:51:35 +0800 Subject: [PATCH] fix : 提交差异 --- src/main/java/com/boying/service/impl/OutParkServiceImpl.java | 61 ++++++++++++++++++++++++++++++ 1 files changed, 61 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/boying/service/impl/OutParkServiceImpl.java b/src/main/java/com/boying/service/impl/OutParkServiceImpl.java index bd3bbbc..c6ace3d 100644 --- a/src/main/java/com/boying/service/impl/OutParkServiceImpl.java +++ b/src/main/java/com/boying/service/impl/OutParkServiceImpl.java @@ -19,6 +19,7 @@ import org.springframework.stereotype.Service; import java.io.IOException; +import java.time.LocalDateTime; import java.util.Date; import java.util.List; import java.util.Map; @@ -190,6 +191,66 @@ } @Override + public OutPark findBy5min(String carNo, Integer parkId,LocalDateTime dateTime) { + LocalDateTime localDateTime = dateTime.minusMinutes(5); + QueryWrapper<OutPark> wrapper = new QueryWrapper<>(); + wrapper.lambda() + .eq(OutPark::getCarNo,carNo) + .eq(OutPark::getParkId,parkId) + .ge(OutPark::getCreateTime,localDateTime) + .isNotNull(OutPark::getEnterTime); + List<OutPark> outParks = outParkMapper.selectList(wrapper); + if(outParks != null && outParks.size()>0){ + for (OutPark outPark : outParks) { + if(outPark.getPrice() == 0){ + return outPark; + } + if(outPark.getPrice() != 0 && outPark.getStatus() == 1){ + return outPark; + } + } + } + return null; + } + @Override + public OutPark findBy10min(String carNo, Integer parkId,LocalDateTime dateTime,Integer outParkId) { + LocalDateTime localDateTime = dateTime.minusMinutes(10); + QueryWrapper<OutPark> wrapper = new QueryWrapper<>(); + wrapper.lambda() + .eq(OutPark::getCarNo,carNo) + .eq(OutPark::getParkId,parkId) + .ge(OutPark::getCreateTime,localDateTime) + .ge(OutPark::getPrice,0) + .ne(OutPark::getId,outParkId) + .isNotNull(OutPark::getPayCode) + .isNotNull(OutPark::getEnterTime); + List<OutPark> outParks = outParkMapper.selectList(wrapper); + if(outParks != null && outParks.size()>0){ + return outParks.get(0); + } + return null; + } + + @Override + public OutPark findBy5min2(String carNo, Integer parkId,LocalDateTime dateTime) { + LocalDateTime localDateTime = dateTime.minusMinutes(7); + QueryWrapper<OutPark> wrapper = new QueryWrapper<>(); + wrapper.lambda() + .eq(OutPark::getCarNo,carNo) + .eq(OutPark::getParkId,parkId) + .ge(OutPark::getCreateTime,localDateTime) + .ge(OutPark::getPrice,0) + .ne(OutPark::getStatus,1) + .isNotNull(OutPark::getPayCode) + .isNotNull(OutPark::getEnterTime); + List<OutPark> outParks = outParkMapper.selectList(wrapper); + if(outParks != null && outParks.size()>0){ + return outParks.get(0); + } + return null; + } + + @Override public List<OutPark> getList(long current, long size, String carNo, Long parkId, String payCode, String date) { return outParkMapper.getList((current-1)*size,size,carNo,parkId,payCode,date); } -- Gitblit v1.9.1