04-08 资金流水详情补充字段

src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java

@@ -30,11 +30,13 @@ public class FundsDTO {
     private String orderCode;
     private String receivedMarket;      //到账地区
     private String performanceMarket;   //业绩归属地区
+    private String activityName;        //活动名称
     private String name;
     private Integer jwcode;
     private String remark;          //备注
     private Integer goodNum;        //商品数量
     private String goodsName;
+    private String voucher;         //转账凭证
     private String payType;
     // 地区+支付方式组合列表
     @ExcelIgnore
@@ -44,6 +46,9 @@ public class FundsDTO {
     private BigDecimal paymentAmount;
     private BigDecimal handlingCharge;
     private BigDecimal receivedAmount;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date receivedTime;
+
     @ExcelIgnore
     private Integer market;
     private String marketName;

src/main/resources/cashMapper/CashRefundMapper.xml

@@ -452,6 +452,7 @@
         SELECT
         crc.id,
         crc.jwcode,
+        ra.activity_name,
         crc.goods_name,
         crc.remark,
         crc.good_num,
@@ -469,12 +470,15 @@
         ROUND(crc.free_gold / 100.0, 2) as freeGold,
         crc.pay_type,
         crc.pay_time,
+        crc.received_time,
+        crc.voucher,
         crc.status,
         NULL as refundCurrency,
         NULL as refundAmount,
         NULL as relatedId,
         0 as isRefundRow
         FROM cash_record_collection crc
+        left join recharge_activity ra on ra.id = crc.activity
         WHERE 1=1
         <if test="jwcode != null">
             and crc.jwcode = #{jwcode}
@@ -522,6 +526,7 @@
         SELECT
         crc.id,
         crc.jwcode,
+        ra.activity_name,
         crc.goods_name,
         crc.remark,
         crc.good_num,
@@ -540,12 +545,15 @@
         crc.pay_type,
         crr.refund_time as pay_time,
         crc.status,
+        crc.received_time,
+        crc.voucher,
         crr.refund_currency as refundCurrency,
         ROUND(crr.refund_amount / 100.0, 2) as refundAmount,
         crr.related_id as relatedId,
         1 as isRefundRow
         FROM cash_record_refund crr
         INNER JOIN cash_record_collection crc ON crr.related_id = crc.id
+        left join recharge_activity ra on ra.id = crc.activity
         WHERE crc.status =6 and crr.status =41
         <if test="jwcode != null">
             and crc.jwcode = #{jwcode}