From 274b2695b40265639cb8ec84ba6c3adb9f6e91f2 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Mon, 9 Sep 2024 15:19:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jsowell/service/OrderService.java | 2 +- .../src/main/java/com/jsowell/pile/vo/OrderPayRecordVO.java | 1 + .../src/main/resources/mapper/pile/OrderPayRecordMapper.xml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index e0f06b04f..aefdb4a32 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -488,7 +488,7 @@ public class OrderService { } // 支付流水对应页面支付信息 - List payRecords = orderPayRecordService.selectOrderPayInfoList(orderCode); + // List payRecords = orderPayRecordService.selectOrderPayInfoList(orderCode); List payRecordList = orderPayRecordService.selectOrderPayRecordList(orderCode); vo.setPayRecordList(payRecordList); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/OrderPayRecordVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/OrderPayRecordVO.java index 8a7609c7c..580572654 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/OrderPayRecordVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/OrderPayRecordVO.java @@ -14,6 +14,7 @@ public class OrderPayRecordVO { private String outTradeNo; // 微信商户订单号 real_time_monitor_data private String transactionId; // 微信支付订单号 private String refundAmount; // 退款金额 + private String refundTime; // 退款时间 private String payChannel; // 汇付定义的支付渠道 private String payChannelDesc; // 支付渠道描述 diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderPayRecordMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderPayRecordMapper.xml index 4a8fb52b9..1e91c15e6 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderPayRecordMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderPayRecordMapper.xml @@ -436,7 +436,7 @@ t1.order_code as orderCode, t1.pay_amount as payAmount, t1.pay_mode as payMode, - ifnull(t2.create_time, t1.create_time) as payTime, + least(t2.create_time, t1.create_time) as payTime, t1.acquirer as acquirer, t1.deduction_record as deductionRecord, t1.refund_amount as refundAmount,