diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRechargerServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRechargerServiceImpl.java index ba1d067f..a3fae9e2 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRechargerServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRechargerServiceImpl.java @@ -108,6 +108,17 @@ public class FinanceRechargerServiceImpl implements IFinanceRechargerService { vo.setPayTime(TimeUtils.timestampToDate(vo.getPayTime())); vo.setAvatar(UrlUtils.toAbsoluteUrl(vo.getAvatar())); vo.setPayWay(PaymentEnum.getPayWayMsg(Integer.parseInt(vo.getPayWay()))); + + if (vo.getPayStatus().equals(1)) { + RefundRecord refundRecord = refundRecordMapper.selectOne( + new QueryWrapper() + .eq("order_type", "recharge") + .eq("order_id", vo.getId()) + .last("limit 1")); + if (StringUtils.isNotNull(refundRecord)) { + vo.setRefundStatusMsg(RefundEnum.getRefundStatusMsg(refundRecord.getRefundStatus())); + } + } } return PageResult.iPageHandle(iPage); diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/finance/FinanceRechargeListVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/finance/FinanceRechargeListVo.java index d10b211b..c56e346a 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/vo/finance/FinanceRechargeListVo.java +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/finance/FinanceRechargeListVo.java @@ -34,6 +34,12 @@ public class FinanceRechargeListVo implements Serializable { @ApiModelProperty("支付状态: [0=待支付, 1=已支付]") private Integer payStatus; + @ApiModelProperty("退款状态: [0=未退款 , 1=已退款]") + private Integer refundStatus; + + @ApiModelProperty("退款状态描述") + private String refundStatusMsg; + @ApiModelProperty("支付金额") private BigDecimal orderAmount;