From 4dfd3b17483445db01c894c253a1b692f01c0067 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期五, 22 九月 2023 18:12:31 +0800
Subject: [PATCH] 修改
---
src/main/java/com/boying/controller/phone/PayController.java | 22 +++++++++++++++++-----
1 files changed, 17 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 d861d8e..402aa13 100644
--- a/src/main/java/com/boying/controller/phone/PayController.java
+++ b/src/main/java/com/boying/controller/phone/PayController.java
@@ -406,6 +406,7 @@
*/
@PostMapping("zhifa")
public Object zhifa(Long id){
+ System.out.println(id+"寮�濮嬬即璐�");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
String logs = sdf.format(new Date())+"寮�濮嬫壂鐮佺即璐�------銆媆n";
logs += "缃氬崟琛╥d涓猴細"+id+",\n";
@@ -416,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())){
@@ -482,6 +483,7 @@
addOrderRecord2(ticket);
return payurl+eticketnum;
}else {
+ System.out.println("鏀粯鐢宠缂存鐮佽繑鍥炰负锛�"+entity);
return null;
}
}
@@ -538,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);
@@ -559,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