From e6682c9434f133a25660110e39a1f0f993267a65 Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang960204@163.com>
Date: 星期四, 27 七月 2023 14:03:55 +0800
Subject: [PATCH] 提交更新
---
src/main/java/com/boying/controller/phone/PayController.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/boying/controller/phone/PayController.java b/src/main/java/com/boying/controller/phone/PayController.java
index f774b51..d2dcca6 100644
--- a/src/main/java/com/boying/controller/phone/PayController.java
+++ b/src/main/java/com/boying/controller/phone/PayController.java
@@ -417,9 +417,9 @@
writeTxt(logs);
return R.failed("鏈綒鍗曟棤闇�鏀粯璐圭敤");
}
- if(StringUtils.isNotBlank(ticket.getPayCode()) && ticket.getStatus() == 0){
+ if(StringUtils.isNotBlank(ticket.getPayCode()) && ticket.getPayStatus() == 0){
return R.ok("鐢熸垚鐢靛瓙缃氬崟缂存鐮�", "https://hbfs.govpay.ccb.com/online/fssm?fee=130000000001&PyfScnCgycd=01&pyfTpcd=3&BNo="+ticket.getPayCode());
- }else if(StringUtils.isNotBlank(ticket.getPayCode()) && ticket.getStatus() == 1){
+ }else if(StringUtils.isNotBlank(ticket.getPayCode()) && ticket.getPayStatus() == 1){
return R.failed("宸茬即璐�");
}
if(StringUtils.isBlank(ticket.getPayCode())){
@@ -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