From 61fae74b4c77a51e77588c741a70f0872ba34ceb Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期四, 21 九月 2023 16:10:28 +0800
Subject: [PATCH] 修改
---
src/main/java/com/boying/controller/phone/PayController.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/boying/controller/phone/PayController.java b/src/main/java/com/boying/controller/phone/PayController.java
index 03b4ff2..402aa13 100644
--- a/src/main/java/com/boying/controller/phone/PayController.java
+++ b/src/main/java/com/boying/controller/phone/PayController.java
@@ -540,6 +540,12 @@
if(status.equals("03")){
ticket.setPayStatus(1);
dealCar(ticket.getCarNo());
+ if(StringUtils.isNotBlank(ticket.getNumber())){
+ ticket = ticketService.getNumber(ticket);
+ ticket.setPush(0);
+ ticketService.uploadInfo(ticket);
+ return;
+ }
}
if(status.equals("04")||status.equals("05")||status.equals("06")){
ticket.setPayStatus(2);
@@ -561,9 +567,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