From 75c2311c64f595e436272e35b62d749b3fdba925 Mon Sep 17 00:00:00 2001
From: bootx <xxm1995@outlook.com>
Date: Thu, 22 Feb 2024 23:07:23 +0800
Subject: [PATCH] =?UTF-8?q?perf=20=E6=94=AF=E4=BB=98=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=B3=E9=97=AD=E6=97=B6=E9=97=B4=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/core/order/pay/entity/PayOrder.java      |  4 ++++
 .../core/payment/close/service/PayCloseService.java  |  4 +++-
 .../core/payment/notice/result/PayNoticeResult.java  | 12 ++++++++++--
 .../payment/notice/service/ClientNoticeService.java  |  1 +
 .../payment/repair/service/PayRepairService.java     |  8 ++++++--
 .../daxpay/service/dto/order/pay/PayOrderDto.java    |  4 ++++
 6 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/pay/entity/PayOrder.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/pay/entity/PayOrder.java
index e07ceabf1..b5e5f5ee7 100644
--- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/pay/entity/PayOrder.java
+++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/pay/entity/PayOrder.java
@@ -78,6 +78,10 @@ public class PayOrder extends MpBaseEntity implements EntityBaseFunction<PayOrde
     @DbColumn(comment = "支付时间")
     private LocalDateTime payTime;
 
+    /** 关闭时间 */
+    @DbColumn(comment = "支付时间")
+    private LocalDateTime closeTime;
+
     /** 过期时间 */
     @DbColumn(comment = "过期时间")
     private LocalDateTime expiredTime;
diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/service/PayCloseService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/service/PayCloseService.java
index 6ebaca5e8..8a2157005 100644
--- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/service/PayCloseService.java
+++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/service/PayCloseService.java
@@ -24,6 +24,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -130,7 +131,8 @@ public class PayCloseService {
      */
     private void successHandler(PayOrder payOrder){
         // 取消订单
-        payOrder.setStatus(PayStatusEnum.CLOSE.getCode());
+        payOrder.setStatus(PayStatusEnum.CLOSE.getCode())
+                .setCloseTime(LocalDateTime.now());
         payOrderService.updateById(payOrder);
         this.saveRecord(payOrder,true,null);
     }
diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/notice/result/PayNoticeResult.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/notice/result/PayNoticeResult.java
index 179440024..b67c02bd4 100644
--- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/notice/result/PayNoticeResult.java
+++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/notice/result/PayNoticeResult.java
@@ -2,6 +2,8 @@ package cn.bootx.platform.daxpay.service.core.payment.notice.result;
 
 import cn.bootx.platform.daxpay.code.PayChannelEnum;
 import cn.bootx.platform.daxpay.code.PayStatusEnum;
+import cn.bootx.platform.daxpay.serializer.LocalDateTimeToTimestampSerializer;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -46,11 +48,17 @@ public class PayNoticeResult {
     @Schema(description = "支付状态")
     private String status;
 
+    @Schema(description = "支付创建时间")
+    @JsonSerialize(using = LocalDateTimeToTimestampSerializer.class)
+    private LocalDateTime createTime;
+
     @Schema(description = "支付成功时间")
+    @JsonSerialize(using = LocalDateTimeToTimestampSerializer.class)
     private LocalDateTime payTime;
 
-    @Schema(description = "支付创建时间")
-    private LocalDateTime createTime;
+    @Schema(description = "支付关闭时间")
+    @JsonSerialize(using = LocalDateTimeToTimestampSerializer.class)
+    private LocalDateTime closeTime;
 
     @Schema(description = "商户扩展参数,回调时会原样返回")
     private String attach;
diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/notice/service/ClientNoticeService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/notice/service/ClientNoticeService.java
index 1ef8b4b25..951d6c66a 100644
--- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/notice/service/ClientNoticeService.java
+++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/notice/service/ClientNoticeService.java
@@ -152,6 +152,7 @@ public class ClientNoticeService {
                 .setBusinessNo(order.getBusinessNo())
                 .setAmount(order.getAmount())
                 .setPayTime(order.getPayTime())
+                .setCloseTime(order.getCloseTime())
                 .setCreateTime(order.getCreateTime())
                 .setStatus(order.getStatus())
                 .setAttach(orderExtra.getAttach())
diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/service/PayRepairService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/service/PayRepairService.java
index d867f692b..c2ea358c9 100644
--- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/service/PayRepairService.java
+++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/service/PayRepairService.java
@@ -140,7 +140,9 @@ public class PayRepairService {
     private void closeLocal(PayOrder order, List<AbsPayRepairStrategy> absPayStrategies) {
         // 执行策略的关闭方法
         absPayStrategies.forEach(AbsPayRepairStrategy::doCloseLocalHandler);
-        order.setStatus(PayStatusEnum.CLOSE.getCode());
+        order.setStatus(PayStatusEnum.CLOSE.getCode())
+                // TODO 尝试是否可以使用网关返回的
+                .setCloseTime(LocalDateTime.now());
         payOrderService.updateById(order);
     }
     /**
@@ -150,7 +152,9 @@ public class PayRepairService {
     private void closeGateway(PayOrder payOrder, List<AbsPayRepairStrategy> absPayStrategies) {
         // 执行策略的关闭方法
         absPayStrategies.forEach(AbsPayRepairStrategy::doCloseGatewayHandler);
-        payOrder.setStatus(PayStatusEnum.CLOSE.getCode());
+        payOrder.setStatus(PayStatusEnum.CLOSE.getCode())
+                // TODO 尝试是否可以使用网关返回的
+                .setCloseTime(LocalDateTime.now());
         payOrderService.updateById(payOrder);
     }
 
diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/order/pay/PayOrderDto.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/order/pay/PayOrderDto.java
index aaa5e6f1c..e44e1f77e 100644
--- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/order/pay/PayOrderDto.java
+++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/order/pay/PayOrderDto.java
@@ -68,6 +68,10 @@ public class PayOrderDto extends BaseDto {
     @Schema(description = "支付时间")
     private LocalDateTime payTime;
 
+    /** 关闭时间 */
+    @Schema(description = "关闭时间")
+    private LocalDateTime closeTime;
+
     /** 过期时间 */
     @Schema(description = "过期时间")
     private LocalDateTime expiredTime;