chuangte/smart-switch-java
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

debug:电量变化记录错误

Browse Source
This commit is contained in:
磷叶 2024-10-17 10:31:45 +08:00
parent f7fa804b07
commit 2f03f23288
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java
View File

@ -1222,31 +1222,31 @@ public class TransactionBillServiceImpl implements TransactionBillService, After
ServiceUtil.assertion(refund != 1, "申请退款失败"); ServiceUtil.assertion(refund != 1, "申请退款失败");
}, 0, TimeUnit.SECONDS); }, 0, TimeUnit.SECONDS);
} }
}
// 清零设备 // 清零设备
try { try {
transactionTemplate.execute(status -> { transactionTemplate.execute(status -> {
// 记录设备关闭状态：成功 // 记录设备关闭状态：成功
int update = this.updateCloseStatus(order.getBillId(), RechargeCloseStatus.SUCCESS, "成功"); int update = this.updateCloseStatus(order.getBillId(), RechargeCloseStatus.SUCCESS, "成功");
ServiceUtil.assertion(update != 1, "更新设备关闭状态失败"); ServiceUtil.assertion(update != 1, "更新设备关闭状态失败");
// 尝试设备清零时长、电量 // 尝试设备清零时长、电量
if (withDevice) { if (withDevice) {
if (SuitFeeType.TIME.getType().equals(order.getSuitFeeType())) { if (SuitFeeType.TIME.getType().equals(order.getSuitFeeType())) {
deviceService.resetTime(device, true); deviceService.resetTime(device, true);
} else if (SuitFeeType.COUNT.getType().equals(order.getSuitFeeType())) { } else if (SuitFeeType.COUNT.getType().equals(order.getSuitFeeType())) {
deviceService.resetEle(device, true); deviceService.resetEle(device, true);
}
} }
}
return update; return update;
}); });
} catch (Exception e) { } catch (Exception e) {
log.warn("设备归零失败: {}", e.getMessage()); log.warn("设备归零失败: {}", e.getMessage());
// 记录设备关闭状态 // 记录设备关闭状态
this.updateCloseStatus(order.getBillId(), RechargeCloseStatus.FAIL, e.getMessage()); this.updateCloseStatus(order.getBillId(), RechargeCloseStatus.FAIL, e.getMessage());
return EndUseVO.toResult(result, false, e.getMessage()); return EndUseVO.toResult(result, false, e.getMessage());
}
} }
return EndUseVO.toResult(result, true, null); return EndUseVO.toResult(result, true, null);