|
@@ -200,6 +200,10 @@ public class OpenService {
|
|
automaticPay.run(null, tbBusinessCar.getCarNo(), 1);
|
|
automaticPay.run(null, tbBusinessCar.getCarNo(), 1);
|
|
return ResultJson.error("请缴停车费" + dif + "元");
|
|
return ResultJson.error("请缴停车费" + dif + "元");
|
|
} else {
|
|
} else {
|
|
|
|
+ //无需交停车费,又没有支付的--->设置成免费车辆
|
|
|
|
+ if (tbBusinessCar.getPayTime() == null) {
|
|
|
|
+ tbBusinessCar.setPayType(TbBusinessCar.PayTypeEnum.FEE_TYPE.getType());
|
|
|
|
+ }
|
|
freeOut(tbBusinessCar, now, channel, image);
|
|
freeOut(tbBusinessCar, now, channel, image);
|
|
return ResultJson.success();
|
|
return ResultJson.success();
|
|
}
|
|
}
|
|
@@ -216,7 +220,7 @@ public class OpenService {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (autoPayCount == businessList.size()) {
|
|
if (autoPayCount == businessList.size()) {
|
|
- log.info("车辆到达卡口进行扣停车费和业务费:{}",carNo);
|
|
|
|
|
|
+ log.info("车辆到达卡口进行扣停车费和业务费:{}", carNo);
|
|
//自动缴费
|
|
//自动缴费
|
|
automaticPay.run(null, tbBusinessCar.getCarNo(), 3);
|
|
automaticPay.run(null, tbBusinessCar.getCarNo(), 3);
|
|
tbDeductionBindService.autoUnbindCar(tbBusinessCar.getCarNo());
|
|
tbDeductionBindService.autoUnbindCar(tbBusinessCar.getCarNo());
|