diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRefundServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRefundServiceImpl.java index f269c20a..f5984d89 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRefundServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRefundServiceImpl.java @@ -15,6 +15,7 @@ import com.mdd.common.core.PageResult; import com.mdd.common.entity.RechargeOrder; import com.mdd.common.entity.RefundLog; import com.mdd.common.entity.RefundRecord; +import com.mdd.common.enums.RefundEnum; import com.mdd.common.mapper.RefundLogMapper; import com.mdd.common.mapper.RefundRecordMapper; import com.mdd.common.util.StringUtils; @@ -78,6 +79,12 @@ public class FinanceRefundServiceImpl implements IFinanceRefundService { FinanceRefundListVo.class, mpjQueryWrapper); + for (FinanceRefundListVo vo : iPage.getRecords()) { + vo.setRefundTypeMsg(RefundEnum.getRefundTypeMsg(vo.getRefundType())); + vo.setRefundStatusMsg(RefundEnum.getRefundStatusMsg(vo.getRefundStatus())); + vo.setCreateTime(TimeUtils.timestampToDate(vo.getCreateTime())); + } + Map extend = new LinkedHashMap<>(); extend.put("total", refundRecordMapper.selectCount(null)); extend.put("ing", refundRecordMapper.selectCount(new QueryWrapper().eq("refund_status", 0))); diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/finance/FinanceRefundListVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/finance/FinanceRefundListVo.java index 9705aa0d..e1791467 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/vo/finance/FinanceRefundListVo.java +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/finance/FinanceRefundListVo.java @@ -35,11 +35,17 @@ public class FinanceRefundListVo implements Serializable { private BigDecimal refundAmount; @ApiModelProperty("退款类型: 1=后台退款") - private String refundType; + private Integer refundType; - @ApiModelProperty("款状态: 0=退款中, 1=退款成功, 2=退款失败") + @ApiModelProperty("退款状态: 0=退款中, 1=退款成功, 2=退款失败") private Integer refundStatus; + @ApiModelProperty("退款类型描述") + private String refundTypeMsg; + + @ApiModelProperty("退款状态描述") + private String refundStatusMsg; + @ApiModelProperty("记录时间") private String createTime; diff --git a/server/like-common/src/main/java/com/mdd/common/enums/RefundEnum.java b/server/like-common/src/main/java/com/mdd/common/enums/RefundEnum.java index 8d1f4f2f..fe523626 100644 --- a/server/like-common/src/main/java/com/mdd/common/enums/RefundEnum.java +++ b/server/like-common/src/main/java/com/mdd/common/enums/RefundEnum.java @@ -45,10 +45,10 @@ public enum RefundEnum { } /** - * 根据编码获取Msg + * 订单类型标识 * * @author fzr - * @param code 类型 + * @param code 编码 * @return String */ public static String getOrderType(Integer code){ @@ -61,4 +61,38 @@ public enum RefundEnum { return "未知"; } + /** + * 退款类型描述 + * + * @author fzr + * @param code 编码 + * @return String + */ + public static String getRefundTypeMsg(Integer code) + { + if (code == 1) { + return RefundEnum.TYPE_ADMIN.getMsg(); + } + return "未知"; + } + + /** + * 退款状态描述 + * + * @author fzr + * @param code 编码 + * @return String + */ + public static String getRefundStatusMsg(Integer code){ + switch (code) { + case 0: + return RefundEnum.REFUND_ING.getMsg(); + case 1: + return RefundEnum.REFUND_SUCCESS.getMsg(); + case 2: + return RefundEnum.REFUND_ERROR.getMsg(); + } + return "未知"; + } + }