From 5e22677b2c7efcc7d8b4584739d496b11326b41b Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期二, 09 四月 2024 13:37:00 +0800
Subject: [PATCH] fix：出场车辆新增判断是否支付过的接口
---
src/main/java/com/boying/service/OutParkService.java | 3 ++-
src/main/java/com/boying/service/impl/OutParkServiceImpl.java | 3 ++-
src/main/java/com/boying/controller/phone/YCPayController.java | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/boying/controller/phone/YCPayController.java b/src/main/java/com/boying/controller/phone/YCPayController.java
index 04335d9..0adef10 100644
--- a/src/main/java/com/boying/controller/phone/YCPayController.java
+++ b/src/main/java/com/boying/controller/phone/YCPayController.java
@@ -164,7 +164,7 @@
return R.ok(1,"璁㈠崟宸叉彁浜ゆ敮浠樿姹�");
}
if(StringUtils.isBlank(outPark.getPayCode())){
- OutPark by10min = outParkService.findBy10min(outPark.getCarNo(), outPark.getParkId(), outPark.getCreateTime());
+ OutPark by10min = outParkService.findBy10min(outPark.getCarNo(), outPark.getParkId(), outPark.getCreateTime(),outPark.getId());
if(by10min !=null){
return R.ok(1,"璁㈠崟宸叉彁浜ゆ敮浠樿姹�");
}else {
diff --git a/src/main/java/com/boying/service/OutParkService.java b/src/main/java/com/boying/service/OutParkService.java
index 0cd5c27..f1074af 100644
--- a/src/main/java/com/boying/service/OutParkService.java
+++ b/src/main/java/com/boying/service/OutParkService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.boying.entity.OutPark;
import com.boying.entity.Statistic;
+import io.swagger.models.auth.In;
import java.time.LocalDateTime;
import java.util.List;
@@ -43,6 +44,6 @@
OutPark findByOrderId(String txnOrderId);
OutPark findBy5min(String carNo, Integer parkId, LocalDateTime dateTime);
- OutPark findBy10min(String carNo, Integer parkId, LocalDateTime dateTime);
+ OutPark findBy10min(String carNo, Integer parkId, LocalDateTime dateTime, Integer outParkId);
}
diff --git a/src/main/java/com/boying/service/impl/OutParkServiceImpl.java b/src/main/java/com/boying/service/impl/OutParkServiceImpl.java
index c9a883b..c93130c 100644
--- a/src/main/java/com/boying/service/impl/OutParkServiceImpl.java
+++ b/src/main/java/com/boying/service/impl/OutParkServiceImpl.java
@@ -213,7 +213,7 @@
return null;
}
@Override
- public OutPark findBy10min(String carNo, Integer parkId,LocalDateTime dateTime) {
+ public OutPark findBy10min(String carNo, Integer parkId,LocalDateTime dateTime,Integer outParkId) {
LocalDateTime localDateTime = dateTime.minusMinutes(10);
QueryWrapper<OutPark> wrapper = new QueryWrapper<>();
wrapper.lambda()
@@ -221,6 +221,7 @@
.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);
--
Gitblit v1.9.1