From 9151b8577bc25bd31833057724ddbf1fa6bdbf0e Mon Sep 17 00:00:00 2001 From: lijianlin Date: Fri, 14 Nov 2025 16:00:39 +0800 Subject: [PATCH] =?UTF-8?q?11-14=20=E6=94=B6=E6=AC=BE=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/domain/vo/cash/CashCollection.java | 47 ++++++++++++++++++++-- .../example/demo/domain/vo/cash/CashRecordDTO.java | 2 +- 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java b/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java index 38cfc61..2966402 100644 --- a/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java +++ b/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java @@ -1,5 +1,7 @@ package com.example.demo.domain.vo.cash; +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelProperty; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Data; @@ -27,57 +29,96 @@ public class CashCollection implements Serializable { private Integer id; //订单信息 private Integer orderType; // 订单类型：1-收款，2-退款 + @ExcelProperty("精网号") private Integer jwcode; // 精网号 + @ExcelProperty("姓名") private String name; // 姓名 + @ExcelIgnore private String market; // 所属地区 + @ExcelProperty("所属地区") private String marketName; // 所属地区名称 - private String activity; // 活动名称 + @ExcelProperty("活动") + private String activity; // 活动 + @ExcelProperty("金币订单号") private String orderCode; // 金币订单号 + @ExcelProperty("银行流水订单号") private String bankCode; // 银行流水订单号 + @ExcelProperty("商品名称") private String goodsName; // 商品名称 + @ExcelProperty("商品数量") private Integer goodNum; // 商品数量 private String numUnit; //数量单位 个/月/年 + @ExcelProperty("永久金币数量") private Integer permanentGold; // 永久金币数量 + @ExcelProperty("免费金币数量") private Integer freeGold; // 免费金币数量 //金额信息 + @ExcelProperty("付款币种") private String paymentCurrency; // 付款币种 + @ExcelProperty("付款金额") private BigDecimal paymentAmount; // 付款金额 + @ExcelProperty("到账币种") private String receivedCurrency; // 到账币种 + @ExcelProperty("到账金额") private BigDecimal receivedAmount; // 到账金额 + @ExcelProperty("手续费") private BigDecimal handlingCharge; // 手续费 + @ExcelProperty("到账币种") private String receivedMarket; //到账地区 // 支付信息 + @ExcelProperty("支付方式") private String payType; // 支付方式 + @ExcelProperty("付款时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private LocalDateTime payTime; // 付款日期（秒级） + @ExcelProperty("到账时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private LocalDateTime receivedTime; // 到账日期（秒级） //状态 操作人 + @ExcelIgnore private Integer status; // 订单状态 + @ExcelIgnore private Integer submitterId; // 提交人 id + @ExcelProperty("提交人地区") private String submitterMarket; //提交人地区 + @ExcelProperty("提交人姓名") private String submitterName; // 提交人 姓名 + @ExcelProperty("转账凭证") private String voucher; // 转账凭证 + @ExcelProperty("备注") private String remark; // 备注 + @ExcelIgnore private String receivedRemark; //到账备注 + @ExcelIgnore private String rejectReason; // 驳回理由 - private Integer auditId; //审核人id - private String auditName; //审核人id + @ExcelIgnore + private String auditId; //审核人id + @ExcelProperty("审核人") + private String auditName; //审核人姓名 + @ExcelIgnore private Integer cashRoleId; //角色id(0客服，1地区财务/负责人，2总部) + @ExcelIgnore @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private LocalDateTime createTime; + @ExcelIgnore @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private LocalDateTime updateTime; + @ExcelIgnore @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private LocalDateTime auditTime; //搜索筛条件 + @ExcelIgnore @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private LocalDateTime startTime; // 付款时间起 + @ExcelIgnore @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private LocalDateTime endTime; // 付款时间止 + @ExcelIgnore private String sortField; //排序字段 + @ExcelIgnore private String sortOrder; //排序顺序 + @ExcelIgnore private List markets; // 所属地区列表 } diff --git a/src/main/java/com/example/demo/domain/vo/cash/CashRecordDTO.java b/src/main/java/com/example/demo/domain/vo/cash/CashRecordDTO.java index 6f46211..8ecb065 100644 --- a/src/main/java/com/example/demo/domain/vo/cash/CashRecordDTO.java +++ b/src/main/java/com/example/demo/domain/vo/cash/CashRecordDTO.java @@ -22,7 +22,7 @@ import java.util.List; @Data @AllArgsConstructor @NoArgsConstructor -public class CashRecordDTO{ +public class CashRecordDTO{ private String activity;// 活动 private String goodsName;// 商品名称 private Integer goodsNum;// 商品数量