From 9a7be347644a689ca4544a4b56a091fbe64ada7e Mon Sep 17 00:00:00 2001 From: damonyuan <404054358@qq.com> Date: Sat, 9 Nov 2024 21:00:44 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=97=A0=E8=B4=A6=E5=8F=B7=E7=9A=84bug=20feat=20=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E6=97=A0=E6=94=AF=E4=BB=98=E6=97=B6=E9=97=B4=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=20-?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mdd/admin/service/impl/FinanceRechargerServiceImpl.java | 5 +++-- .../mdd/admin/vo/finance/FinanceRechargeListExportVo.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) 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 3d4de516..f1fa8bac 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 @@ -122,7 +122,7 @@ public class FinanceRechargerServiceImpl implements IFinanceRechargerService { for (FinanceRechargeListVo vo : iPage.getRecords()) { vo.setCreateTime(TimeUtils.timestampToDate(vo.getCreateTime())); - vo.setPayTime(TimeUtils.timestampToDate(vo.getPayTime())); + vo.setPayTime(StringUtils.isNull(vo.getPayTime()) ? "-" : TimeUtils.timestampToDate(vo.getPayTime())); vo.setAvatar(UrlUtils.toAdminAbsoluteUrl(vo.getAvatar())); vo.setPayWay(vo.getPayWay()); vo.setPayWayText(PaymentEnum.getPayWayMsg(Integer.parseInt(vo.getPayWay()))); @@ -399,7 +399,7 @@ public class FinanceRechargerServiceImpl implements IFinanceRechargerService { MPJQueryWrapper mpjQueryWrapper = new MPJQueryWrapper<>(); mpjQueryWrapper.selectAll(RechargeOrder.class) - .select("U.id as user_id,U.account ,U.nickname,U.avatar, t.sn AS sn") + .select("U.id as user_id,U.account,U.nickname,U.avatar,t.sn AS sn") .leftJoin("?_user U ON U.id=t.user_id".replace("?_", GlobalConfig.tablePrefix)) .orderByDesc("id"); @@ -427,6 +427,7 @@ public class FinanceRechargerServiceImpl implements IFinanceRechargerService { mpjQueryWrapper); retList = iPage.getRecords(); } + System.out.println(retList); for (FinanceRechargeListExportVo vo : retList) { vo.setCreateTime(TimeUtils.timestampToDate(vo.getCreateTime())); vo.setPayTime(TimeUtils.timestampToDate(vo.getPayTime())); diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/finance/FinanceRechargeListExportVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/finance/FinanceRechargeListExportVo.java index 858e65b5..3f0dc921 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/vo/finance/FinanceRechargeListExportVo.java +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/finance/FinanceRechargeListExportVo.java @@ -33,7 +33,7 @@ public class FinanceRechargeListExportVo implements Serializable { @ApiModelProperty("账号") @ExcelProperty("账号") @ColumnWidth(50) - private String acount; + private String account; @ApiModelProperty("订单编号") @ExcelProperty("订单编号")