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 5d2dfb0e..6c0c4b4b 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 @@ -109,6 +109,7 @@ public class FinanceRechargerServiceImpl implements IFinanceRechargerService { vo.setAvatar(UrlUtils.toAbsoluteUrl(vo.getAvatar())); vo.setPayWay(PaymentEnum.getPayWayMsg(Integer.parseInt(vo.getPayWay()))); + vo.setIsRefund(0); if (vo.getPayStatus().equals(1)) { RefundRecord refundRecord = refundRecordMapper.selectOne( new QueryWrapper() @@ -116,6 +117,7 @@ public class FinanceRechargerServiceImpl implements IFinanceRechargerService { .eq("order_id", vo.getId()) .last("limit 1")); if (StringUtils.isNotNull(refundRecord)) { + vo.setIsRefund(1); vo.setRefundStatusMsg(RefundEnum.getRefundStatusMsg(refundRecord.getRefundStatus())); } } 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 c56e346a..e6db53aa 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 @@ -37,6 +37,9 @@ public class FinanceRechargeListVo implements Serializable { @ApiModelProperty("退款状态: [0=未退款 , 1=已退款]") private Integer refundStatus; + @ApiModelProperty("是否有退款: [0=否 , 1=是]") + private Integer isRefund; + @ApiModelProperty("退款状态描述") private String refundStatusMsg;