diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/ChargeRecordAdminVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/ChargeRecordAdminVo.java index 51a00c399..c27ced7c1 100644 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/ChargeRecordAdminVo.java +++ b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/ChargeRecordAdminVo.java @@ -71,6 +71,10 @@ public class ChargeRecordAdminVo { @FieldComment("创建时间") public String createTime; // 创建时间 + @ExcelProperty("更新时间") + @FieldComment("更新时间") + public String updateTime; // 创建时间 + } diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/ChargeRecordAdminMapper.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/ChargeRecordAdminMapper.java index 7ac36eedb..3f2046505 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/ChargeRecordAdminMapper.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/ChargeRecordAdminMapper.java @@ -17,10 +17,14 @@ public interface ChargeRecordAdminMapper extends BaseMapper { Page page(Page p, @Param("erbanNo") Long erbanNo, @Param("channel") String channel, @Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("status") Integer status, - @Param("newUser") Boolean newUser, @Param("appChannel") String appChannel, @Param("regionId") Integer regionId); + @Param("newUser") Boolean newUser, @Param("appChannel") String appChannel, @Param("regionId") Integer regionId, + @Param("chargeRecordId") String chargeRecordId, + @Param("pingxxChargeId") String pingxxChargeId); List pageTotal(@Param("erbanNo") Long erbanNo, @Param("channel") String channel, @Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("status") Integer status, @Param("newUser") Boolean newUser, - @Param("appChannel") String appChannel, @Param("regionId") Integer regionId); + @Param("appChannel") String appChannel, @Param("regionId") Integer regionId, + @Param("chargeRecordId") String chargeRecordId, + @Param("pingxxChargeId") String pingxxChargeId); List listFisrChargeRecordByUids(@Param("uids") List uids); diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/ChargeRecordAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/ChargeRecordAdminService.java index 25e882041..6bed699aa 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/ChargeRecordAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/ChargeRecordAdminService.java @@ -306,9 +306,11 @@ public class ChargeRecordAdminService extends BaseService { } public PageResult chargeRecordList(Integer pageNumber, Integer pageSize, Long erbanNo, String channel, Date startTime, - Date endTime, Integer status, Boolean newUser, String appChannel, Boolean totalStat, Integer regionId) { + Date endTime, Integer status, Boolean newUser, String appChannel, Boolean totalStat, Integer regionId, + String chargeRecordId, + String pingxxChargeId) { Page p = new Page<>(pageNumber, pageSize); - chargeRecordAdminMapper.page(p, erbanNo, channel, startTime, endTime, status, newUser, appChannel, regionId); + chargeRecordAdminMapper.page(p, erbanNo, channel, startTime, endTime, status, newUser, appChannel, regionId, chargeRecordId, pingxxChargeId); PageResult pageResult = new PageResult<>(p); List rows = pageResult.getRows(); if (CollectionUtils.isEmpty(rows)) { @@ -322,7 +324,8 @@ public class ChargeRecordAdminService extends BaseService { row.setRegionName(regionName.get(row.getRegionId())); } if (totalStat) { - List chargeRecordAdminVo = chargeRecordAdminMapper.pageTotal(erbanNo, channel, startTime, endTime, status, newUser, appChannel, regionId); + List chargeRecordAdminVo = chargeRecordAdminMapper + .pageTotal(erbanNo, channel, startTime, endTime, status, newUser, appChannel, regionId, chargeRecordId, pingxxChargeId); if (CollectionUtils.isEmpty(chargeRecordAdminVo)) { return pageResult; } @@ -344,8 +347,10 @@ public class ChargeRecordAdminService extends BaseService { } - public void exportChargeRecordList(OutputStream outputStream, Long erbanNo, String channel, Date startTime, Date endTime, Integer status, Boolean newUser, String appChannel, Integer regionId) { - PageResult page = chargeRecordList(-1, -1, erbanNo, channel, startTime, endTime, status, newUser, appChannel, false, regionId); + public void exportChargeRecordList(OutputStream outputStream, Long erbanNo, String channel, Date startTime, Date endTime, Integer status, Boolean newUser, + String appChannel, Integer regionId, String chargeRecordId, String pingxxChargeId) { + PageResult page = chargeRecordList(-1, -1, erbanNo, channel, startTime, endTime, + status, newUser, appChannel, false, regionId, chargeRecordId, pingxxChargeId); EasyExcel.write(outputStream, ChargeRecordAdminVo.class).sheet("充值明细").doWrite(page.getRows()); } diff --git a/accompany-admin/accompany-admin-service/src/main/resources/mapper/ChargeRecordAdminMapper.xml b/accompany-admin/accompany-admin-service/src/main/resources/mapper/ChargeRecordAdminMapper.xml index edf9267bc..463e60280 100644 --- a/accompany-admin/accompany-admin-service/src/main/resources/mapper/ChargeRecordAdminMapper.xml +++ b/accompany-admin/accompany-admin-service/src/main/resources/mapper/ChargeRecordAdminMapper.xml @@ -3,6 +3,7 @@ +