From 75afedd9f0c0943a85afe039e11ac7edd59bfa4f Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang960204@163.com>
Date: 星期六, 28 九月 2024 10:21:34 +0800
Subject: [PATCH] fix:更新出场
---
src/main/java/com/boying/controller/phone/PayController.java | 19 ++++++++++++++++---
1 files changed, 16 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..843bb41 100644
--- a/src/main/java/com/boying/controller/phone/PayController.java
+++ b/src/main/java/com/boying/controller/phone/PayController.java
@@ -15,7 +15,9 @@
import com.boying.service.*;
import com.boying.util.HTTPEntityUtil;
import com.google.gson.Gson;
+
import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.util.DigestUtils;
import org.springframework.web.bind.annotation.PostMapping;
@@ -50,6 +52,7 @@
private final TicketService ticketService;
private final TicketBlackService ticketBlackService;
private final OutParkService outParkService;
+ @Autowired
private final SystemConfigProperties systemConfigProperties;
private final ParkService parkService;
private final WhiteListService whiteListService;
@@ -540,6 +543,12 @@
if(status.equals("03")){
ticket.setPayStatus(1);
dealCar(ticket.getCarNo());
+ if(StringUtils.isBlank(ticket.getNumber()) || "--".equals(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 +570,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