diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java index 1bc942a1..3c3288c4 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java @@ -973,10 +973,7 @@ public class TransactionBillServiceImpl implements TransactionBillService, After // 是否成功 boolean success = result != null && result; - if (success) { - // 记录时长变化 - this.recordTime(bill, "用户充值订单:" + bill.getBillNo()); - } else { + if (!success) { // 修改设备充值状态为失败 transactionBillMapper.updateDeviceRechargeStatus( billId, @@ -1001,8 +998,7 @@ public class TransactionBillServiceImpl implements TransactionBillService, After LocalDateTime now = LocalDateTime.now(); LocalDateTime startTime = device.getExpireTime() == null || now.isAfter(device.getExpireTime()) ? now : device.getExpireTime(); - BigDecimal startEle = device.getExpireEle() == null || device.getExpireEle().compareTo(device.getTotalElectriQuantity()) < 0 ? - device.getTotalElectriQuantity() : device.getExpireEle(); + BigDecimal startEle = device.getTotalElectriQuantity(); TransactionBill data = new TransactionBill(); data.setBillId(bill.getBillId());