From a2312c7a34971aa5d0122fa179f5b8d1da28e78c Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang960204@163.com>
Date: 星期五, 19 四月 2024 11:20:27 +0800
Subject: [PATCH] fix:新增手持接口
---
src/main/java/com/boying/controller/phone/YCPayController.java | 7 +++++--
1 files changed, 5 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..c556217 100644
--- a/src/main/java/com/boying/controller/phone/YCPayController.java
+++ b/src/main/java/com/boying/controller/phone/YCPayController.java
@@ -163,15 +163,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