From f9a85d68b1a08b03753d297f76bd4e87bb4d2b3e Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期四, 11 四月 2024 14:42:26 +0800
Subject: [PATCH] fix：手动抬杆接口更新
---
src/main/java/com/boying/controller/OutParkController.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/boying/controller/OutParkController.java b/src/main/java/com/boying/controller/OutParkController.java
index 3d3556d..3d0a6e5 100644
--- a/src/main/java/com/boying/controller/OutParkController.java
+++ b/src/main/java/com/boying/controller/OutParkController.java
@@ -81,6 +81,9 @@
//閬撻椄code
@PostMapping("/findByBarrierCode")
public Object findById(String code) {
+ if(StringUtils.isBlank(code)){
+ return R.failed(null,"鍙傛暟閿欒");
+ }
QueryWrapper<Barrier> wrapper = new QueryWrapper<>();
wrapper.lambda()
.eq(Barrier::getCode2,code);
@@ -110,6 +113,9 @@
//閬撻椄code
@PostMapping("/findByBarrierCode2")
public Object findById2(String code2) {
+ if(StringUtils.isBlank(code2)){
+ return R.failed(null,"鍙傛暟閿欒");
+ }
System.out.println("code2 :"+code2);
QueryWrapper<Barrier> wrapper = new QueryWrapper<>();
wrapper.lambda()
@@ -326,10 +332,34 @@
enterPark.setParkId(parkId);
enterPark.setBarrierId(list.get(0).getId());
enterPark.setStatus(0);
+ enterPark.setIsAdd(1);
enterPark.setIsPay(0);
- enterPark.setImgId(null);
enterParkService.saveOrUpdate(enterPark);
- return R.ok("淇敼鎴愬姛");
+
+ OutPark outPark = null;
+ QueryWrapper<OutPark> wrapper1 = new QueryWrapper<>();
+ wrapper1.lambda()
+ .eq(OutPark::getParkId,parkId)
+ .eq(OutPark::getCarNo,carNo)
+ .ge(OutPark::getCreateTime,enterPark.getCreateTime())
+ .ne(OutPark::getStatus,1);
+ List<OutPark> list1 = outParkService.list(wrapper1);
+ if(list1 !=null&&list1.size()>0){
+ outPark = list1.get(0);
+ outPark.setEnterTime(enterPark.getCreateTime());
+ long l = outPark.getCreateTime().toInstant(ZoneOffset.of("+8")).toEpochMilli() - enterPark.getCreateTime().toInstant(ZoneOffset.of("+8")).toEpochMilli();
+ outPark.setTime(l/(1000*60));
+ try {
+ outPark.setPrice(costRuleService.getMoney(parkId, outPark.getEnterTime(), outPark.getCreateTime(), 1));
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ outParkService.saveOrUpdate(outPark);
+ return R.ok(null,"淇敼鍑哄満璁板綍鎴愬姛");
+ }else {
+ return R.ok(null,"鏂板鍏ュ満璁板綍鎴愬姛");
+ }
+
}
--
Gitblit v1.9.1