diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java index c8d84ef..aea11a2 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java @@ -425,6 +425,7 @@ public class AsDeviceServiceImpl extends ServiceImpl i order.setAppointmentEndTime(DateUtils.getNowDate()); //计算预约费 calculateAppointmentFee(order); + order.setTotalFee(order.getAppointmentFee()); int update = etOrderService.updateEtOrder(order); if(update==0){ log.info("【扫码/编号开锁骑行】更新订单失败"); @@ -772,6 +773,11 @@ public class AsDeviceServiceImpl extends ServiceImpl i order.setStatus(ServiceConstants.ORDER_STATUS_CANCEL_APPOINTMENT); order.setAppointmentEndTime(new Date()); order.setAppointmentTimeout("1"); + //计算预约费 + BigDecimal appointmentServiceFee = area.getAppointmentServiceFee(); + BigDecimal fee = appointmentServiceFee.multiply(new BigDecimal(area.getTimeoutMinutes()).divide(new BigDecimal(10))); + order.setAppointmentFee(fee); + order.setTotalFee(fee); int update = etOrderService.updateEtOrder(order); if(update==0){ throw new ServiceException("【车辆预约】:更新订单状态失败");