From ab361e724c5c4185d96397af0619398c7fe2f195 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期一, 10 七月 2023 16:15:55 +0800
Subject: [PATCH] 修改
---
src/main/java/com/boying/controller/TicketBlackController.java | 1 +
src/main/java/com/boying/controller/phone/PayController.java | 10 +++++++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/boying/controller/TicketBlackController.java b/src/main/java/com/boying/controller/TicketBlackController.java
index 4dc166f..3a4aaf5 100644
--- a/src/main/java/com/boying/controller/TicketBlackController.java
+++ b/src/main/java/com/boying/controller/TicketBlackController.java
@@ -46,6 +46,7 @@
public Object findPage(Page page, TicketBlack ticket){
QueryWrapper<TicketBlack> wrapper = new QueryWrapper<>();
wrapper.lambda()
+ .eq(TicketBlack::getBlackType,0)
.eq(StringUtils.isNotBlank(ticket.getCarNo()),TicketBlack::getCarNo,ticket.getCarNo())
.eq(ticket.getIsActive() != null,TicketBlack::getIsActive,ticket.getIsActive())
.orderByDesc(TicketBlack::getCreateTime);
diff --git a/src/main/java/com/boying/controller/phone/PayController.java b/src/main/java/com/boying/controller/phone/PayController.java
index 03b4ff2..d2dcca6 100644
--- a/src/main/java/com/boying/controller/phone/PayController.java
+++ b/src/main/java/com/boying/controller/phone/PayController.java
@@ -561,9 +561,13 @@
wrapper1.lambda()
.eq(TicketBlack::getCarNo,carNo);
List<TicketBlack> all = ticketBlackService.list(wrapper1);
- for(TicketBlack ticketBlack:all){
- ticketBlack.setStatus(1);
- ticketBlack.setBlackType(0);
+ if(all.size()>0){
+ TicketBlack ticketBlack = all.get(0);
+ ticketBlack.setViolationCount(ticketBlack.getViolationCount() == 0?0:ticketBlack.getViolationCount() - 1);
+ if(ticketBlack.getIsActive() == 0){
+ ticketBlack.setStatus(1);
+ ticketBlack.setBlackType(0);
+ }
ticketBlackService.saveOrUpdate(ticketBlack);
}
}
--
Gitblit v1.9.1