mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix 修复导出无账号的bug 

feat 如果无支付时间显示 -
This commit is contained in:
damonyuan 2024-11-09 21:00:44 +08:00
parent 4ff64636fc
commit 9a7be34764
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRechargerServiceImpl.java
View File

@ -122,7 +122,7 @@ public class FinanceRechargerServiceImpl implements IFinanceRechargerService {
for (FinanceRechargeListVo vo : iPage.getRecords()) { for (FinanceRechargeListVo vo : iPage.getRecords()) {
vo.setCreateTime(TimeUtils.timestampToDate(vo.getCreateTime())); 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.setAvatar(UrlUtils.toAdminAbsoluteUrl(vo.getAvatar()));
vo.setPayWay(vo.getPayWay()); vo.setPayWay(vo.getPayWay());
vo.setPayWayText(PaymentEnum.getPayWayMsg(Integer.parseInt(vo.getPayWay()))); vo.setPayWayText(PaymentEnum.getPayWayMsg(Integer.parseInt(vo.getPayWay())));
@ -399,7 +399,7 @@ public class FinanceRechargerServiceImpl implements IFinanceRechargerService {
MPJQueryWrapper<RechargeOrder> mpjQueryWrapper = new MPJQueryWrapper<>(); MPJQueryWrapper<RechargeOrder> mpjQueryWrapper = new MPJQueryWrapper<>();
mpjQueryWrapper.selectAll(RechargeOrder.class) 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)) .leftJoin("?_user U ON U.id=t.user_id".replace("?_", GlobalConfig.tablePrefix))
.orderByDesc("id"); .orderByDesc("id");
@ -427,6 +427,7 @@ public class FinanceRechargerServiceImpl implements IFinanceRechargerService {
mpjQueryWrapper); mpjQueryWrapper);
retList = iPage.getRecords(); retList = iPage.getRecords();
} }
System.out.println(retList);
for (FinanceRechargeListExportVo vo : retList) { for (FinanceRechargeListExportVo vo : retList) {
vo.setCreateTime(TimeUtils.timestampToDate(vo.getCreateTime())); vo.setCreateTime(TimeUtils.timestampToDate(vo.getCreateTime()));
vo.setPayTime(TimeUtils.timestampToDate(vo.getPayTime())); vo.setPayTime(TimeUtils.timestampToDate(vo.getPayTime()));

2
server/like-admin/src/main/java/com/mdd/admin/vo/finance/FinanceRechargeListExportVo.java
View File

@ -33,7 +33,7 @@ public class FinanceRechargeListExportVo implements Serializable {
@ApiModelProperty("账号") @ApiModelProperty("账号")
@ExcelProperty("账号") @ExcelProperty("账号")
@ColumnWidth(50) @ColumnWidth(50)
private String acount; private String account;
@ApiModelProperty("订单编号") @ApiModelProperty("订单编号")
@ExcelProperty("订单编号") @ExcelProperty("订单编号")