10.23 执行人修改

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<Integer> 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;   // 结束时间
+
 
 }

src/main/resources/cashMapper/CashRefundMapper.xml

@@ -233,6 +233,9 @@
         <if test="payType != null and payType.length()>0">
             and cr.pay_type = #{payType}
         </if>
+        <if test="receivedMarket != null and receivedMarket.length()>0">
+            and cr.received_market = #{receivedMarket}
+        </if>
         <if test="refundModel != null and refundModel.length()>0">
             and cr.refundModel = #{refundModel}
         </if>
@@ -242,6 +245,15 @@
         <if test=" submitterId!= null">
             and cr.submitter_id = #{submitterId}
         </if>
+        <if test="refundCurrency != null and refundCurrency.length()>0">
+            and cr.refund_currency = #{refundCurrency}
+        </if>
+        <if test="refundChannels != null and refundChannels.length()>0">
+            and cr.refund_channels = #{refundChannels}
+        </if>
+            <if test="sTime != null and eTime != null">
+                and cr.`pay_time` BETWEEN #{sTime} AND #{eTime}
+            </if>
         </where>
         <choose>
             <when test="sortField != null and sortField.length > 0 or sortOrder != null and sortOrder.length > 0">