From 15b3290a092ea16be998d5ce3c1df06ec3752bb5 Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang960204@163.com>
Date: 星期二, 15 八月 2023 10:37:54 +0800
Subject: [PATCH] 提交更新
---
src/main/java/com/boying/controller/car/PlateServlet3.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/boying/controller/car/PlateServlet3.java b/src/main/java/com/boying/controller/car/PlateServlet3.java
index 82b1f85..612d1e5 100644
--- a/src/main/java/com/boying/controller/car/PlateServlet3.java
+++ b/src/main/java/com/boying/controller/car/PlateServlet3.java
@@ -359,6 +359,8 @@
if(tickets.size()>0){
enterPark.setStatus(1);//鍙戠幇鏈夎繚绔�
}
+ enterPark.setIsPay(0);
+ enterPark.setPrice(0);
enterParkService.deleteByCarNo(enterPark.getCarNo(),enterPark.getParkId());
enterParkService.save(enterPark);
barrier.setType2(1);
@@ -409,6 +411,15 @@
outPark.setTime(l/(1000*60));
toDayHrMinSec = DateUtilOther.millisToDayHrMinSec(l/(1000*60));
money = costRuleService.getMoney(one.getParkId(), outPark.getEnterTime(), outPark.getCreateTime(), 1);
+
+ //鍏ュ満璁板綍淇濆瓨涓�涓�
+ if(one.getIsPay()==1){
+ money = money - one.getPrice();
+ }else {
+ one.setPrice(money);
+ one.setIsPay(0);
+ enterParkService.updateById(one);
+ }
} catch (ParseException e) {
e.printStackTrace();
}
@@ -486,6 +497,8 @@
}else {
enterParkService.deleteByCarNo(carNo,parkId);
EnterPark enterPark = new EnterPark();
+ enterPark.setIsPay(0);
+ enterPark.setPrice(0);
enterPark.setCarNo(carNo);
enterPark.setBarrierId(barrierId);
enterPark.setParkId(parkId);
@@ -528,6 +541,15 @@
outPark.setTime(l/(1000*60));
toDayHrMinSec = DateUtilOther.millisToDayHrMinSec(l/(1000*60));
money = costRuleService.getMoney(parkId, outPark.getEnterTime(), outPark.getCreateTime(), 1);
+
+ //鍏ュ満璁板綍淇濆瓨涓�涓�
+ if(enterPark.getIsPay() != null && enterPark.getIsPay()==1){
+ money = money - enterPark.getPrice();
+ }else {
+ enterPark.setPrice(money);
+ enterPark.setIsPay(0);
+ enterParkService.updateById(enterPark);
+ }
} catch (ParseException e) {
e.printStackTrace();
}
@@ -556,7 +578,7 @@
if(w.getType()==0){
outLedShowYueZu(barrier.getCarNo(),"鏈堢杞�",parkId,request,response,0);
OutPark byCarNoAndBarrierId = outParkService.findByCarNoAndBarrierId(carNo, barrierId);
- byCarNoAndBarrierId.setStatus(1);
+ byCarNoAndBarrierId.setStatus(2);
byCarNoAndBarrierId.setStatus2(1);
outParkService.saveOrUpdate(byCarNoAndBarrierId);
return 0.0;
@@ -570,7 +592,7 @@
if(pid == outPark.getParkId() && System.currentTimeMillis()<w.getEndTime().getTime()){
outLedShowYueZu(barrier.getCarNo(),"鏈堢杞�",parkId,request,response,0);
OutPark byCarNoAndBarrierId = outParkService.findByCarNoAndBarrierId(carNo, barrierId);
- byCarNoAndBarrierId.setStatus(1);
+ byCarNoAndBarrierId.setStatus(2);
byCarNoAndBarrierId.setStatus2(1);
outParkService.saveOrUpdate(byCarNoAndBarrierId);
return 0.0;
--
Gitblit v1.9.1