diff --git a/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/constant/IotConstants.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/constant/IotConstants.java index 36890803..9d447070 100644 --- a/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/constant/IotConstants.java +++ b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/constant/IotConstants.java @@ -73,12 +73,12 @@ public class IotConstants { public static final String COMMAND_OUTAGE_WAY = "set"; /** - * 命令 累加充值电量 + * 命令 累加充值电量,设备不会自行关闭 */ public static final String COMMAND_ADD_ELE = "money"; /** - * 命令 直接设置电量 + * 命令 直接设置电量,设备会自行关闭 */ public static final String COMMAND_SET_ELE = "mmney"; diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceServiceImpl.java index 9c25a2ce..18a7fbbc 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceServiceImpl.java @@ -518,12 +518,12 @@ public class DeviceServiceImpl implements DeviceService ServiceUtil.assertion(insertRecord != 1, "记录电量变化失败"); if (withIot) { - // 若设备剩余电量小于0,则补偿电量充值 + // 若设备剩余电量大于0,则补偿电量充值 CommandResponse res; - if (device.getSurplusEle().compareTo(BigDecimal.ZERO) < 0) { - res = iotService.addEle(device, amount.subtract(device.getSurplusEle()), reason); + if (device.getSurplusEle().compareTo(BigDecimal.ZERO) > 0) { + res = iotService.setEle(device, amount.add(device.getSurplusEle()), reason); } else { - res = iotService.addEle(device, amount, reason); + res = iotService.setEle(device, amount, reason); } boolean iot = res.isSuccess(); ServiceUtil.assertion(!iot, "为设备充值电量失败"); 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 feff6849..3a45fe86 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 @@ -953,7 +953,7 @@ public class TransactionBillServiceImpl implements TransactionBillService, After boolean addTime = deviceService.addTime(device, seconds, true, "充值订单:" + bill.getBillNo()); ServiceUtil.assertion(!addTime, "设备时长充值失败"); } else if (SuitFeeType.COUNT.getType().equals(bill.getSuitFeeType())) { - // 设备设置电量 + // 设备增加电量 BigDecimal ele = transactionBillConverter.toRechargeEle(bill); boolean addEle = deviceService.addEle(device, ele, true, "充值订单:" + bill.getBillNo()); ServiceUtil.assertion(!addEle, "设备时长充值失败");