update

jsowell-netty/src/main/java/com/jsowell/netty/handler/HeartbeatRequestHandler.java

@@ -65,7 +65,11 @@ public class HeartbeatRequestHandler extends AbstractHandler {
 		// updateStatus(pileSn, pileConnectorNum, connectorStatus);
 
 		// 公共方法修改状态
+		try {
 			pileBasicInfoService.updateStatus(BytesUtil.bcd2Str(ykcDataProtocol.getFrameType()), pileSn, pileConnectorNum, connectorStatus, null);
+		} catch (Exception e) {
+			log.error("公共方法修改状态error", e);
+		}
 
 		// 心跳应答（置0）
 		byte[] flag = Constants.zeroByteArray;

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()

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;
 }