Browse Source

11.20导出修复字段

sunjiabei/feature-20251021102635-银行接口
huangqizhen 6 days ago
parent
commit
1cc2c448dd
  1. 56
      src/main/java/com/example/demo/domain/vo/cash/CashRecordDTO.java

56
src/main/java/com/example/demo/domain/vo/cash/CashRecordDTO.java

@ -1,6 +1,7 @@
package com.example.demo.domain.vo.cash; package com.example.demo.domain.vo.cash;
import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
@ -23,31 +24,52 @@ import java.util.List;
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
public class CashRecordDTO{ public class CashRecordDTO{
@ExcelIgnore
private String activity;// 活动 private String activity;// 活动
@ExcelProperty("商品名称")
private String goodsName;// 商品名称 private String goodsName;// 商品名称
@ExcelProperty("商品数量")
private Integer goodsNum;// 商品数量 private Integer goodsNum;// 商品数量
@ExcelProperty("商品单位")
private String numUnit;// 商品单位 private String numUnit;// 商品单位
@ExcelIgnore
private BigDecimal gold;//永久金币 private BigDecimal gold;//永久金币
@ExcelIgnore
private BigDecimal free;//免费金币 private BigDecimal free;//免费金币
@ExcelIgnore
private String paymentCurrency;// 支付币种 private String paymentCurrency;// 支付币种
@ExcelIgnore
private BigDecimal paymentAmount;// 支付金额 private BigDecimal paymentAmount;// 支付金额
@ExcelIgnore
private String receivedCurrency;// 收款币种 private String receivedCurrency;// 收款币种
@ExcelIgnore
private BigDecimal receivedAmount;// 收款金额 private BigDecimal receivedAmount;// 收款金额
@ExcelIgnore
private BigDecimal handlingCharge;// 手续费 private BigDecimal handlingCharge;// 手续费
@ExcelIgnore
private String payBankCode;// 付款银行 private String payBankCode;// 付款银行
@ExcelIgnore
private String payType;// 支付方式 private String payType;// 支付方式
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
@ExcelIgnore
private LocalDateTime payTime;// 付款时间 private LocalDateTime payTime;// 付款时间
@ExcelIgnore
private String receivedMarket;// 收款地区 private String receivedMarket;// 收款地区
@ExcelIgnore
private String payVoucher;// 支付凭证 private String payVoucher;// 支付凭证
@ExcelIgnore
private String payRemark;// 支付备注 private String payRemark;// 支付备注
//提交人 //提交人
@ExcelIgnore
private String paySubmitter; private String paySubmitter;
//提交人 //提交人
@ExcelProperty("提交人")
private String Submitter; private String Submitter;
//审核人 //审核人
@ExcelIgnore
private String audit; private String audit;
//到账日期 //到账日期
@ExcelIgnore
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
private LocalDateTime receivedTime; private LocalDateTime receivedTime;
@ExcelIgnore @ExcelIgnore
@ -59,42 +81,51 @@ public class CashRecordDTO{
/** /**
* 序号 * 序号
*/ */
@ExcelProperty("序号")
private Integer id; private Integer id;
/** /**
* 精网号 * 精网号
*/ */
@ExcelProperty("精网号")
private Integer jwcode; private Integer jwcode;
/** /**
* 姓名 * 姓名
*/ */
@ExcelProperty("姓名")
private String userName; private String userName;
@ExcelIgnore
private String name; private String name;
/** /**
* 所属地区 * 所属地区
*/ */
@ExcelProperty("所属地区")
private Integer market; private Integer market;
/** /**
* 金币订单号 * 金币订单号
*/ */
@ExcelIgnore
private String orderCode; private String orderCode;
/** /**
* 银行流水订单号 * 银行流水订单号
*/ */
@ExcelIgnore
private String bankCode; private String bankCode;
/** /**
* 永久金币 * 永久金币
*/ */
@ExcelIgnore
private BigDecimal permanentGold; private BigDecimal permanentGold;
/** /**
* 免费金币 * 免费金币
*/ */
@ExcelIgnore
private BigDecimal freeGold; private BigDecimal freeGold;
/** /**
@ -115,6 +146,7 @@ public class CashRecordDTO{
30总部财务待审核32总部财务驳回 30总部财务待审核32总部财务驳回
40执行人待处理41执行人已处理退款结束 40执行人待处理41执行人已处理退款结束
*/ */
@ExcelProperty("订单状态")
private Integer status; private Integer status;
/** /**
@ -126,85 +158,101 @@ public class CashRecordDTO{
/** /**
* 提交人地区 * 提交人地区
*/ */
@ExcelIgnore
private String submitterMarket; private String submitterMarket;
/** /**
* 转账凭证 * 转账凭证
*/ */
@ExcelIgnore
private String voucher; private String voucher;
/** /**
* 备注 * 备注
*/ */
@ExcelProperty("备注")
private String remark; private String remark;
/** /**
* 驳回理由 * 驳回理由
*/ */
@ExcelIgnore
private String rejectReason; private String rejectReason;
/** /**
* 退款备注理由,客服填写 * 退款备注理由,客服填写
*/ */
@ExcelProperty("退款备注")
private String refundReason; private String refundReason;
/** /**
* 退款方式0全额/1部分 * 退款方式0全额/1部分
*/ */
@ExcelProperty("退款方式")
private Integer refundModel; private Integer refundModel;
/** /**
* 退款执行人OA号 * 退款执行人OA号
*/ */
@ExcelIgnore
private Integer executor; private Integer executor;
/** /**
* 退款途径 * 退款途径
*/ */
@ExcelIgnore
private String refundChannels; private String refundChannels;
/** /**
* 退款日期到天 * 退款日期到天
*/ */
@ExcelIgnore
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
private Date refundTime; private Date refundTime;
/** /**
* 退款备注执行人填写 * 退款备注执行人填写
*/ */
@ExcelIgnore
private String refundRemark; private String refundRemark;
/** /**
* 退款截图 * 退款截图
*/ */
@ExcelIgnore
private String refundVoucher; private String refundVoucher;
/** /**
* 创建时间 * 创建时间
*/ */
@ExcelIgnore
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
private Date createTime; private Date createTime;
/** /**
* 更新时间 * 更新时间
*/ */
@ExcelIgnore
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
private Date updateTime; private Date updateTime;
/** /**
* 审核时间 * 审核时间
*/ */
@ExcelIgnore
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
private Date auditTime; private Date auditTime;
/** /**
* 退款币种 * 退款币种
*/ */
@ExcelIgnore
private String refundCurrency; private String refundCurrency;
/** /**
* 退款金额 * 退款金额
*/ */
@ExcelIgnore
private String refundAmount; private String refundAmount;
/** /**
@ -218,9 +266,13 @@ public class CashRecordDTO{
@ExcelIgnore @ExcelIgnore
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
private Date endTime; // 结束时间 private Date endTime; // 结束时间
@ExcelIgnore
private String submitterName; private String submitterName;
@ExcelIgnore
private String auditName; private String auditName;
@ExcelIgnore
private String executorName; private String executorName;
@ExcelIgnore
private String marketName; private String marketName;
@ExcelIgnore @ExcelIgnore
private List<Integer> statuses; private List<Integer> statuses;
@ -229,9 +281,13 @@ public class CashRecordDTO{
@ExcelIgnore @ExcelIgnore
private String currentTaskId; // 当前任务ID private String currentTaskId; // 当前任务ID
@ExcelIgnore
private String areaServise; private String areaServise;
@ExcelIgnore
private String areaFinance; private String areaFinance;
@ExcelIgnore
private String areaCharge; private String areaCharge;
@ExcelIgnore
private String headFinance; private String headFinance;
@ExcelIgnore @ExcelIgnore
private String sortField; private String sortField;

Loading…
Cancel
Save