diff --git a/src/main/java/com/example/demo/domain/vo/cash/CashRecordDone.java b/src/main/java/com/example/demo/domain/vo/cash/CashRecordDone.java index b394a4d..badd124 100644 --- a/src/main/java/com/example/demo/domain/vo/cash/CashRecordDone.java +++ b/src/main/java/com/example/demo/domain/vo/cash/CashRecordDone.java @@ -39,13 +39,13 @@ public class CashRecordDone { /** 币种 */ private String paymentCurrency; /** 金额 */ - private Integer paymentAmount; + private BigDecimal paymentAmount; /** 到账币种 */ private String receivedCurrency; /** 到账金额 */ - private Integer receivedAmount; + private BigDecimal receivedAmount; /** 手续费 */ - private Integer handlingCharge; + private BigDecimal handlingCharge; /** 支付方式 */ private String payType; /** 到账地区 */ @@ -98,7 +98,7 @@ public class CashRecordDone { private String auditName; private String executorName; private String refundCurrency; - private Integer refundAmount; + private BigDecimal refundAmount; private String marketName; private List statuses; private Integer permanentGold; @@ -114,5 +114,10 @@ public class CashRecordDone { private String sortField; private String sortOrder; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + private Date sTime; // 开始时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + private Date eTime; // 结束时间 + } \ No newline at end of file diff --git a/src/main/resources/cashMapper/CashRefundMapper.xml b/src/main/resources/cashMapper/CashRefundMapper.xml index bef2ad6..9c908de 100644 --- a/src/main/resources/cashMapper/CashRefundMapper.xml +++ b/src/main/resources/cashMapper/CashRefundMapper.xml @@ -233,6 +233,9 @@ and cr.pay_type = #{payType} + + and cr.received_market = #{receivedMarket} + and cr.refundModel = #{refundModel} @@ -242,6 +245,15 @@ and cr.submitter_id = #{submitterId} + + and cr.refund_currency = #{refundCurrency} + + + and cr.refund_channels = #{refundChannels} + + + and cr.`pay_time` BETWEEN #{sTime} AND #{eTime} +