From 0dbcef10ee43cdab704ecf5e81fec50e884569e5 Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang960204@163.com>
Date: 星期三, 16 十月 2024 15:14:18 +0800
Subject: [PATCH] fix:更新手机号入场

---
 src/main/java/com/boying/controller/phone/YCPayController.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/boying/controller/phone/YCPayController.java b/src/main/java/com/boying/controller/phone/YCPayController.java
index 0c773ed..a19093c 100644
--- a/src/main/java/com/boying/controller/phone/YCPayController.java
+++ b/src/main/java/com/boying/controller/phone/YCPayController.java
@@ -13,6 +13,7 @@
 import com.boying.service.*;
 import com.boying.util.DateUtilOther;
 import com.google.gson.Gson;
+
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.http.ResponseEntity;
@@ -163,15 +164,18 @@
         if(StringUtils.isNotBlank(outPark.getPayCode()) && outPark.getStatus() == 0){
             return R.ok(1,"璁㈠崟宸叉彁浜ゆ敮浠樿姹�");
         }
+        if(StringUtils.isNotBlank(outPark.getPayCode()) && outPark.getStatus() == 1){
+            return R.failed(0,"璁㈠崟宸茬即璐�");
+        }
         if(StringUtils.isBlank(outPark.getPayCode())){
-            OutPark by10min = outParkService.findBy10min(outPark.getCarNo(), outPark.getParkId(), outPark.getCreateTime());
+            OutPark by10min = outParkService.findBy10min(outPark.getCarNo(), outPark.getParkId(), outPark.getCreateTime(),outPark.getId());
             if(by10min !=null){
                 return R.ok(1,"璁㈠崟宸叉彁浜ゆ敮浠樿姹�");
             }else {
                 return R.ok(0,"璇锋彁浜ゆ敮浠�");
             }
         }
-        return R.ok(0,"璇锋彁浜ゆ敮浠�");
+        return R.failed(0,"璇锋彁浜ゆ敮浠�");
     }
 
 

--
Gitblit v1.9.1