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 | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 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 e696599..402aa13 100644
--- a/src/main/java/com/boying/controller/phone/PayController.java
+++ b/src/main/java/com/boying/controller/phone/PayController.java
@@ -53,6 +53,7 @@
private final SystemConfigProperties systemConfigProperties;
private final ParkService parkService;
private final WhiteListService whiteListService;
+ private final NowPayOrderService nowPayOrderService;
static String payKey = "df937eda27cb4a59a12347966678e232";
static String paySecret = "9e3b2f387b5b4232a9c782affc9c36ed";
@@ -381,11 +382,31 @@
}
+
+ /**
+ * 鑾峰彇鎵ф硶id
+ */
+ @PostMapping("getZhifaId")
+ public Object getZhifaId(){
+ QueryWrapper<NowPayOrder> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(NowPayOrder::getType,0)
+ .orderByDesc(NowPayOrder::getCreateTime)
+ .last(" limit 1");
+ NowPayOrder one = nowPayOrderService.getOne(wrapper);
+ if(one == null){
+ return R.failed(null,"鏆傛棤缂磋垂椤圭洰");
+ }else {
+ return R.ok(ticketService.getById(one.getQueryId()));
+ }
+ }
+
/**
* 缂存涔�
*/
@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";
@@ -396,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())){
@@ -462,6 +483,7 @@
addOrderRecord2(ticket);
return payurl+eticketnum;
}else {
+ System.out.println("鏀粯鐢宠缂存鐮佽繑鍥炰负锛�"+entity);
return null;
}
}
@@ -518,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);
@@ -539,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