From da9a4f7ad988c452f3a356989eaf7a6c06ae5032 Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang960204@163.com>
Date: 星期四, 26 九月 2024 23:03:05 +0800
Subject: [PATCH] fix:合并代码
---
src/main/java/com/boying/controller/phone/PayController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/boying/controller/phone/PayController.java b/src/main/java/com/boying/controller/phone/PayController.java
index 402aa13..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,7 +543,7 @@
if(status.equals("03")){
ticket.setPayStatus(1);
dealCar(ticket.getCarNo());
- if(StringUtils.isNotBlank(ticket.getNumber())){
+ if(StringUtils.isBlank(ticket.getNumber()) || "--".equals(ticket.getNumber())){
ticket = ticketService.getNumber(ticket);
ticket.setPush(0);
ticketService.uploadInfo(ticket);
--
Gitblit v1.9.1