From 66e05a8501d69c234cc2db6d1e4330accdb5c55f Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Wed, 10 Jan 2024 15:17:02 +0800 Subject: [PATCH] update --- .../jsowell/netty/handler/HeartbeatRequestHandler.java | 6 +++++- .../service/impl/ClearingWithdrawInfoServiceImpl.java | 4 +++- .../main/java/com/jsowell/pile/vo/web/WithdrawInfoVO.java | 8 ++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/HeartbeatRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/HeartbeatRequestHandler.java index 2c35e7676..1af34081b 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/HeartbeatRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/HeartbeatRequestHandler.java @@ -65,7 +65,11 @@ public class HeartbeatRequestHandler extends AbstractHandler { // updateStatus(pileSn, pileConnectorNum, connectorStatus); // 公共方法修改状态 - pileBasicInfoService.updateStatus(BytesUtil.bcd2Str(ykcDataProtocol.getFrameType()), pileSn, pileConnectorNum, connectorStatus, null); + try { + pileBasicInfoService.updateStatus(BytesUtil.bcd2Str(ykcDataProtocol.getFrameType()), pileSn, pileConnectorNum, connectorStatus, null); + } catch (Exception e) { + log.error("公共方法修改状态error", e); + } // 心跳应答（置0） byte[] flag = Constants.zeroByteArray; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ClearingWithdrawInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ClearingWithdrawInfoServiceImpl.java index 3ca39637c..dac17297c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ClearingWithdrawInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ClearingWithdrawInfoServiceImpl.java @@ -150,7 +150,9 @@ public class ClearingWithdrawInfoServiceImpl implements ClearingWithdrawInfoServ statusDesc = "已提现"; } vo.setStatusDesc(statusDesc); - vo.setCashAmt(clearingWithdrawInfo.getCreditedAmt()); + vo.setCashAmt(clearingWithdrawInfo.getWithdrawAmt()); + vo.setCreditedAmt(clearingWithdrawInfo.getCreditedAmt()); + vo.setFeeAmt(clearingWithdrawInfo.getFeeAmt()); resultList.add(vo); } PageResponse pageResponse = PageResponse.builder() diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/WithdrawInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/WithdrawInfoVO.java index c7a60f150..516392c01 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/WithdrawInfoVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/WithdrawInfoVO.java @@ -25,4 +25,12 @@ public class WithdrawInfoVO { // 提现金额 private BigDecimal cashAmt; + + // 到账金额 + private BigDecimal creditedAmt; + + /** + * 提现手续费 + */ + private BigDecimal feeAmt; }